Skip to content

Commit 7d3ae87

Browse files
Update docker commands to fix build issues with new registry scanner module
1 parent ad15c8d commit 7d3ae87

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,15 @@ image: clean-image
9090
docker build \
9191
-t ${IMAGE_PREFIX}${IMAGE_NAME}:${IMAGE_TAG} \
9292
--pull \
93+
-f Dockerfile \
9394
.
9495

9596
.PHONY: multiarch-image
9697
multiarch-image:
9798
docker buildx build \
9899
-t ${IMAGE_PREFIX}${IMAGE_NAME}:${IMAGE_TAG} \
99100
--progress plain \
101+
-f Dockerfile \
100102
--pull \
101103
--platform ${RELEASE_IMAGE_PLATFORMS} ${DOCKERX_PUSH} \
102104
.
@@ -106,8 +108,9 @@ multiarch-image-push:
106108
docker buildx build \
107109
-t ${IMAGE_PREFIX}${IMAGE_NAME}:${IMAGE_TAG} \
108110
--progress plain \
111+
-f Dockerfile \
109112
--pull \
110-
--push \
113+
# --push \
111114
--platform ${RELEASE_IMAGE_PLATFORMS} ${DOCKERX_PUSH} \
112115
.
113116

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.23.0
66

77
require (
88
github.com/Masterminds/semver/v3 v3.3.0
9-
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-00010101000000-000000000000
9+
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20241204160458-8076d2005ea6
1010
github.com/argoproj/argo-cd/v2 v2.13.0
1111
github.com/argoproj/gitops-engine v0.7.1-0.20240905010810-bd7681ae3f8b
1212
github.com/argoproj/pkg v0.13.7-0.20230627120311-a4dd357b057e
@@ -176,7 +176,7 @@ require (
176176
)
177177

178178
replace (
179-
github.com/argoproj-labs/argocd-image-updater/registry-scanner => ./registry-scanner
179+
// github.com/argoproj-labs/argocd-image-updater/registry-scanner => ./registry-scanner
180180
github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
181181
github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
182182

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ github.com/alicebob/miniredis/v2 v2.33.0/go.mod h1:MhP4a3EU7aENRi9aO+tHfTBZicLqQ
2727
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
2828
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
2929
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
30+
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20241204160458-8076d2005ea6 h1:S0ezzzv85HF2ayGYsMA7v28FaNgRO3bctHAFnl8xzBk=
31+
github.com/argoproj-labs/argocd-image-updater/registry-scanner v0.0.0-20241204160458-8076d2005ea6/go.mod h1:o1vNJv+ZrjvOq3PnSr1b6/ug7cfXMPv85yS84l/0bFs=
3032
github.com/argoproj/argo-cd/v2 v2.13.0 h1:arfqqaSmvDBF6KBQtSR/zsF9TIipO4Ns2jHB2q8x62s=
3133
github.com/argoproj/argo-cd/v2 v2.13.0/go.mod h1:RC23V2744nhZstZVpLCWTQLT2gR0+IXGC3GTBCI6M+I=
3234
github.com/argoproj/gitops-engine v0.7.1-0.20240905010810-bd7681ae3f8b h1:wOPWJ5MBScQO767WpU55oUJDXObfvPL0EfAYWxogbSw=

0 commit comments

Comments
 (0)