Skip to content

Commit f0ba090

Browse files
committed
make: fix publish to push multi-arch images; remove buildx prerequisite and split Debian/Ubuntu loops; avoid --load manifest list error
1 parent f8498d3 commit f0ba090

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

Makefile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,18 @@ buildx-%: %
6161
push:
6262
for v in $(ALL_VARIANTS); do docker push $(NAMESPACE)/multiflexi-$$v:latest; done
6363

64-
publish: buildx
65-
for v in $(ALL_VARIANTS); do docker buildx build \
64+
publish:
65+
for v in $(DEBIAN_VARIANTS); do docker buildx build \
6666
--platform $(PLATFORMS) \
67-
-f $(if $(findstring $$v, $(DEBIAN_VARIANTS)),debian/$$v/Dockerfile,ubuntu/$$v/Dockerfile) \
67+
-f debian/$$v/Dockerfile \
68+
--build-arg REPO_URL=$(REPO_URL) \
69+
--build-arg KEY_URL=$(KEY_URL) \
70+
-t $(NAMESPACE)/multiflexi-$$v:latest \
71+
--push \
72+
.; done
73+
for v in $(UBUNTU_VARIANTS); do docker buildx build \
74+
--platform $(PLATFORMS) \
75+
-f ubuntu/$$v/Dockerfile \
6876
--build-arg REPO_URL=$(REPO_URL) \
6977
--build-arg KEY_URL=$(KEY_URL) \
7078
-t $(NAMESPACE)/multiflexi-$$v:latest \

0 commit comments

Comments
 (0)