Build: Fix multi-arch docker builds
Change-Id: I3968065215b696256ee819e2062ab1d3cadfcbcf
diff --git a/apps/app-repository/Makefile b/apps/app-repository/Makefile
index b9d7bc2..09b9a8c 100644
--- a/apps/app-repository/Makefile
+++ b/apps/app-repository/Makefile
@@ -1,3 +1,10 @@
+repo_name ?= giolekva
+podman ?= docker
+docker_flags=--provenance=false --sbom=false
+ifeq ($(podman), podman)
+manifest_dest=docker://docker.io/$(repo_name)/app-repository:latest
+endif
+
clean:
rm -f server_*
@@ -16,18 +23,14 @@
go build -o server_amd64 cmd/*.go
push_arm64: clean build_arm64
- podman build --platform linux/arm64 --tag=giolekva/app-repository:arm64 .
- podman push giolekva/app-repository:arm64
+ $(podman) build --platform linux/arm64 --tag=giolekva/app-repository:arm64 $(docker_flags) .
+ $(podman) push giolekva/app-repository:arm64
push_amd64: clean build_amd64
- podman build --platform linux/amd64 --tag=giolekva/app-repository:amd64 .
- podman push giolekva/app-repository:amd64
+ $(podman) build --platform linux/amd64 --tag=giolekva/app-repository:amd64 $(docker_flags) .
+ $(podman) push giolekva/app-repository:amd64
push: push_arm64 push_amd64
- podman manifest create giolekva/app-repository:latest giolekva/app-repository:arm64 giolekva/app-repository:amd64
- podman manifest push giolekva/app-repository:latest docker://docker.io/giolekva/app-repository:latest
- podman manifest rm giolekva/app-repository:latest
-
-run:
- go run cmd/*.go
+ $(podman) manifest create giolekva/app-repository:latest giolekva/app-repository:arm64 giolekva/app-repository:amd64
+ $(podman) manifest push --purge giolekva/app-repository:latest $(manifest_dest)