Update docker commands to fix build issues with new registry scanner …

…module
argoproj-labs · Dec 5, 2024 · 7d3ae87 · 7d3ae87
1 parent ad15c8d
commit 7d3ae87
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -90,13 +90,15 @@ image: clean-image
 	docker build \
 		-t ${IMAGE_PREFIX}${IMAGE_NAME}:${IMAGE_TAG} \
 		--pull \
+		-f Dockerfile \
 		.
 
 .PHONY: multiarch-image
 multiarch-image:
 	docker buildx build \
 		-t ${IMAGE_PREFIX}${IMAGE_NAME}:${IMAGE_TAG} \
 		--progress plain \
+		-f Dockerfile \
 		--pull \
 		--platform ${RELEASE_IMAGE_PLATFORMS} ${DOCKERX_PUSH} \
 		.
@@ -106,8 +108,9 @@ multiarch-image-push:
 	docker buildx build \
 		-t ${IMAGE_PREFIX}${IMAGE_NAME}:${IMAGE_TAG} \
 		--progress plain \
+		-f Dockerfile \
 		--pull \
-		--push \
+		# --push \
 		--platform ${RELEASE_IMAGE_PLATFORMS} ${DOCKERX_PUSH} \
 		.
 

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.23.0
 
 require (
 	github.com/Masterminds/semver/v3 v3.3.0
-	github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-00010101000000-000000000000
+	github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20241204160458-8076d2005ea6
 	github.com/argoproj/argo-cd/v2 v2.13.0
 	github.com/argoproj/gitops-engine v0.7.1-0.20240905010810-bd7681ae3f8b
 	github.com/argoproj/pkg v0.13.7-0.20230627120311-a4dd357b057e
@@ -176,7 +176,7 @@ require (
 )
 
 replace (
-	github.com/argoproj-labs/argocd-image-updater/registry-scanner => ./registry-scanner
+	// github.com/argoproj-labs/argocd-image-updater/registry-scanner => ./registry-scanner
 	github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
 	github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
 

diff --git a/go.sum b/go.sum
@@ -27,6 +27,8 @@ github.com/alicebob/miniredis/v2 v2.33.0/go.mod h1:MhP4a3EU7aENRi9aO+tHfTBZicLqQ
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
+github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20241204160458-8076d2005ea6 h1:S0ezzzv85HF2ayGYsMA7v28FaNgRO3bctHAFnl8xzBk=
+github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20241204160458-8076d2005ea6/go.mod h1:o1vNJv+ZrjvOq3PnSr1b6/ug7cfXMPv85yS84l/0bFs=
 github.com/argoproj/argo-cd/v2 v2.13.0 h1:arfqqaSmvDBF6KBQtSR/zsF9TIipO4Ns2jHB2q8x62s=
 github.com/argoproj/argo-cd/v2 v2.13.0/go.mod h1:RC23V2744nhZstZVpLCWTQLT2gR0+IXGC3GTBCI6M+I=
 github.com/argoproj/gitops-engine v0.7.1-0.20240905010810-bd7681ae3f8b h1:wOPWJ5MBScQO767WpU55oUJDXObfvPL0EfAYWxogbSw=