Merge pull request replicatedhq#2217 from replicatedhq/emosbaugh/sc-3…

…7237/kots-dex-image-should-be-build-from-a-dockerfile Build Dex image from dockerfile
MFrank2016 · Sep 29, 2021 · 9fec7b0 · 9fec7b0
2 parents 677f524 + e71494b
commit 9fec7b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ include Makefile.build
 CURRENT_USER := $(shell id -u -n)
 MINIO_TAG ?= RELEASE.2021-09-15T04-54-25Z
 POSTGRES_ALPINE_TAG ?= 10.18-alpine
-DEX_TAG ?= v2.28.1
+DEX_TAG ?= v2.30.0
 LVP_VERSION := v0.1.0
 
 BUILDFLAGS = -tags='netgo containers_image_ostree_stub exclude_graphdriver_devicemapper exclude_graphdriver_btrfs containers_image_openpgp' -installsuffix netgo
@@ -96,10 +96,8 @@ build-release:
 	docker tag kotsadm/kotsadm:${GIT_TAG} kotsadm/kotsadm:v0.0.0-nightly
 	docker push kotsadm/kotsadm:v0.0.0-nightly
 
-	docker pull ghcr.io/dexidp/dex:${DEX_TAG}
-	docker tag ghcr.io/dexidp/dex:${DEX_TAG} kotsadm/dex:${DEX_TAG}
+	docker build --pull -f deploy/Dockerfile.dex -t kotsadm/dex:${DEX_TAG} --build-arg TAG=${DEX_TAG} .
 	docker push kotsadm/dex:${DEX_TAG}
-
 	mkdir -p bin/docker-archive/dex
 	skopeo copy docker://kotsadm/dex:${DEX_TAG} docker-archive:bin/docker-archive/dex/${DEX_TAG}
 

diff --git a/deploy/Dockerfile.dex b/deploy/Dockerfile.dex
@@ -0,0 +1,2 @@
+ARG TAG=v2.30.0
+FROM ghcr.io/dexidp/dex:$TAG