From f2a07a275a177584a30fb2c1d816e1ab6a809305 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Mon, 14 Nov 2022 14:12:04 +0100
Subject: [PATCH] Squashed '.ci/' changes from 80dabc2..aece7fc

aece7fc fix: Improve multi-arch manifest handling

git-subtree-dir: .ci
git-subtree-split: aece7fc1a4778a04f16313ae73c8f2b1e4c3a9fd
---
 podman.mk | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/podman.mk b/podman.mk
index f1794c87..8e06f6f1 100644
--- a/podman.mk
+++ b/podman.mk
@@ -2,11 +2,12 @@
 GTAG=$(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
 TAG ?= $(shell echo $(GTAG) | awk -F '-' '{ print $$1 "-" $$2 }' | sed -e 's/-$$//')
 ARCH := amd64
+ALL_ARCHS := amd64 arm64
 
 # EXTRA_TAGS supposed to be set at the caller, eg. $(shell echo $(TAG) | awk -F '.' '{ print $$1 "." $$2 }')
 
 ifneq ($(TRIVY_REMOTE),)
-  TRIVY_OPTS := --server $(TRIVY_REMOTE)
+	TRIVY_OPTS := --server $(TRIVY_REMOTE)
 endif
 
 .SILENT: ; # no need for @
@@ -32,15 +33,17 @@ scan: ## Scan image using trivy
 	echo "Scanning $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) using Trivy $(TRIVY_REMOTE)"
 	trivy image $(TRIVY_OPTS) $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH)
 
-# We create new manifest and add TAG-ARCH image
-# if manigest exists already, get it and add TAG-ARCH to eg. add arm64 to existing amd64
-push: ## push images to registry
-	for t in $(TAG) latest $(EXTRA_TAGS); \
-		do echo "creating and pushing: $$t"; \
-		docker tag $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) $(REGISTRY)/$(IMAGE):$${t}-$(ARCH) && \
-		docker push $(REGISTRY)/$(IMAGE):$${t}-$(ARCH); \
-		podman manifest exists $(IMAGE):$$t || podman manifest create $(IMAGE):$$t; \
-		buildah manifest add $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) && docker manifest push $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$$t; \
+# first tag and push all actual images
+# create new manifest for each tag and add all available TAG-ARCH before pushing
+push: ecr-login ## push images to registry
+	for t in $(TAG) latest $(EXTRA_TAGS); do \
+		[ "$$t" != "$(TAG)" ] && podman tag $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) $(REGISTRY)/$(IMAGE):$${t}-$(ARCH); \
+		podman manifest exists $(IMAGE):$$t && podman manifest rm $(IMAGE):$$t; \
+		podman manifest create $(IMAGE):$$t; \
+		for a in $(ALL_ARCHS); do \
+			podman manifest add $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$(TAG)-$$a; \
+		done; \
+		podman manifest push $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$$t; \
 	done
 
 ecr-login: ## log into AWS ECR public
@@ -51,7 +54,7 @@ clean: rm-test-image rm-image ## delete local built container and test images
 rm-remote-untagged: ## delete all remote untagged images
 	echo "Removing all untagged images from $(IMAGE) in $(REGION)"
 	IMAGE_IDS=$$(for image in $$(aws ecr-public describe-images --repository-name $(IMAGE) --region $(REGION) --output json | jq -r '.imageDetails[] | select(.imageTags | not ).imageDigest'); do echo -n "imageDigest=$$image "; done) ; \
-	  [ -n "$$IMAGE_IDS" ] && aws ecr-public batch-delete-image --repository-name $(IMAGE) --region $(REGION) --image-ids $$IMAGE_IDS || echo "No image to remove"
+		[ -n "$$IMAGE_IDS" ] && aws ecr-public batch-delete-image --repository-name $(IMAGE) --region $(REGION) --image-ids $$IMAGE_IDS || echo "No image to remove"
 
 rm-image:
 	test -z "$$(docker image ls -q $(IMAGE):$(TAG)-$(ARCH))" || docker image rm -f $(IMAGE):$(TAG)-$(ARCH) > /dev/null