diff --git a/podman.mk b/podman.mk index 1eb9b7c..f3f7b48 100644 --- a/podman.mk +++ b/podman.mk @@ -39,12 +39,14 @@ scan: ## Scan image using trivy # 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 \ + 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; \ for a in $(ALL_ARCHS); do \ buildah manifest add $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$(TAG)-$$a; \ done; \ + echo "Pushing manifest $(IMAGE):$$t" buildah manifest push --all $(IMAGE):$$t docker://$(REGISTRY)/$(IMAGE):$$t; \ done diff --git a/vars/buildPodman.groovy b/vars/buildPodman.groovy index b544057..155cfa3 100644 --- a/vars/buildPodman.groovy +++ b/vars/buildPodman.groovy @@ -56,7 +56,7 @@ def call(Map config=[:]) { } } - // Push to container registry + // Push to container registry, skip if PR stage('Push') { when { not { changeRequest() } } steps {