Build: Fix multi-arch docker builds
Change-Id: I3968065215b696256ee819e2062ab1d3cadfcbcf
diff --git a/apps/url-shortener/Makefile b/apps/url-shortener/Makefile
index 9fbc4c4..2dd8864 100644
--- a/apps/url-shortener/Makefile
+++ b/apps/url-shortener/Makefile
@@ -1,6 +1,6 @@
repo_name ?= giolekva
-podman ?= podman
-manifest_dest =
+podman ?= docker
+docker_flags=--provenance=false --sbom=false
ifeq ($(podman), podman)
manifest_dest=docker://docker.io/$(repo_name)/url-shortener:latest
endif
@@ -24,14 +24,13 @@
/usr/local/go/bin/go build -o url-shortener_amd64 *.go
push_arm64: clean build_arm64
- $(podman) build --platform linux/arm64 --tag=$(repo_name)/url-shortener:arm64 .
+ $(podman) build --platform linux/arm64 --tag=$(repo_name)/url-shortener:arm64 $(docker_flags) .
$(podman) push $(repo_name)/url-shortener:arm64
push_amd64: clean build_amd64
- $(podman) build --platform linux/amd64 --tag=$(repo_name)/url-shortener:amd64 .
+ $(podman) build --platform linux/amd64 --tag=$(repo_name)/url-shortener:amd64 $(docker_flags) .
$(podman) push $(repo_name)/url-shortener:amd64
push: push_arm64 push_amd64
$(podman) manifest create $(repo_name)/url-shortener:latest $(repo_name)/url-shortener:arm64 $(repo_name)/url-shortener:amd64
- $(podman) manifest push $(repo_name)/url-shortener:latest $(manifest_dest)
- $(podman) manifest rm $(repo_name)/url-shortener:latest
+ $(podman) manifest push --purge $(repo_name)/url-shortener:latest $(manifest_dest)