From e08d7906bc4be23e05b724d3b6c826705ab9ea73 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 24 Oct 2024 16:08:41 +0000
Subject: [PATCH] Squashed '.ci/' changes from d67a80e..a392836

a392836 feat: migrate all buildah cmds to podman only

git-subtree-dir: .ci
git-subtree-split: a3928364782156003f828ee4639d12b51bb5d9d9
---
 podman.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/podman.mk b/podman.mk
index 5420260..9490110 100644
--- a/podman.mk
+++ b/podman.mk
@@ -43,7 +43,7 @@ fmt:: ## auto format source
 lint:: ## Lint source
 
 build: ## Build the app
-	buildah build --rm --layers -t $(IMAGE):$(TAG)-$(_ARCH) --build-arg TAG=$(TAG) --build-arg ARCH=$(_ARCH) --platform linux/$(_ARCH) .
+	podman build --rm --layers -t $(IMAGE):$(TAG)-$(_ARCH) --build-arg TAG=$(TAG) --build-arg ARCH=$(_ARCH) --platform linux/$(_ARCH) .
 
 test:: ## test built artificats
 
@@ -56,15 +56,15 @@ scan: ## Scan image using trivy
 push: ecr-login ## push images to registry
 	for t in $(TAG) latest $(EXTRA_TAGS); do
 		echo "Tagging image with $(REGISTRY)/$(IMAGE):$${t}-$(ARCH)"
-		buildah tag $(IMAGE):$(TAG)-$(_ARCH) $(REGISTRY)/$(IMAGE):$${t}-$(_ARCH)
-		buildah manifest rm $(IMAGE):$$t || true
-		buildah manifest create $(IMAGE):$$t
+		podman tag $(IMAGE):$(TAG)-$(_ARCH) $(REGISTRY)/$(IMAGE):$${t}-$(_ARCH)
+		podman manifest rm $(IMAGE):$$t || true
+		podman manifest create $(IMAGE):$$t
 		for a in $(ALL_ARCHS); do
 			podman image exists $(REGISTRY)/$(IMAGE):$$t-$$a && \
-			buildah manifest add $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$$t-$$a
+			podman manifest add $(IMAGE):$$t containers-storage:$(REGISTRY)/$(IMAGE):$$t-$$a
 		done
 		echo "Pushing manifest $(IMAGE):$$t"
-		buildah manifest push --all $(IMAGE):$$t docker://$(REGISTRY)/$(IMAGE):$$t
+		podman manifest push --all $(IMAGE):$$t docker://$(REGISTRY)/$(IMAGE):$$t
 	done
 
 ecr-login: ## log into AWS ECR public