From 8c958d8fc291d346c51f8c9e4f800261bac40ffa Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 27 Nov 2024 17:15:00 +0000 Subject: [PATCH] Squashed '.ci/' changes from 2c44e4f..15e4d1f 15e4d1f ci: make work with main branch 3feaf6f chore: migrate to main branch a392836 feat: migrate all buildah cmds to podman only d67a80e feat: make push and rm-image more resilient, prevent exit codes 8e202d4 fix: do not add non-existent images 6ef8d28 feat: ensure bash and safe exec 06fcff5 feat: improve image cleanup to incl. all tags and repositories 47b4da4 feat: add suport for trivyignore file git-subtree-dir: .ci git-subtree-split: 15e4d1f589c8e055944b2a4b58a9a50728e245b4 --- README.md | 2 +- podman.mk | 47 +++++++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 689e535..699dbe6 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ include .ci/podman.mk Add subtree to your project: ``` -git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash +git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git main --squash ``` diff --git a/podman.mk b/podman.mk index b51b762..ed5aa26 100644 --- a/podman.mk +++ b/podman.mk @@ -1,3 +1,13 @@ +SHELL := bash +.SHELLFLAGS := -eu -o pipefail -c +.DELETE_ON_ERROR: +.SILENT: ; # no need for @ +.ONESHELL: ; # recipes execute in same shell +.NOTPARALLEL: ; # wait for this target to finish +.EXPORT_ALL_VARIABLES: ; # send all vars to shell +.PHONY: all # All targets are accessible for user +.DEFAULT: help # Running Make will run the help target + # Parse version from latest git semver tag GIT_TAG ?= $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null) GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) @@ -23,13 +33,6 @@ ifneq ($(TRIVY_REMOTE),) TRIVY_OPTS ::= --server $(TRIVY_REMOTE) endif -.SILENT: ; # no need for @ -.ONESHELL: ; # recipes execute in same shell -.NOTPARALLEL: ; # wait for this target to finish -.EXPORT_ALL_VARIABLES: ; # send all vars to shell -.PHONY: all # All targets are accessible for user -.DEFAULT: help # Running Make will run the help target - help: ## Show Help grep -E '^[a-zA-Z_-]+:.*?## .*$$' .ci/podman.mk | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' @@ -40,27 +43,28 @@ 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 scan: ## Scan image using trivy echo "Scanning $(IMAGE):$(TAG)-$(_ARCH) using Trivy $(TRIVY_REMOTE)" - trivy image $(TRIVY_OPTS) --quiet --no-progress localhost/$(IMAGE):$(TAG)-$(_ARCH) + trivy image $(TRIVY_OPTS) --quiet --no-progress --ignorefile ./.trivyignore.yaml localhost/$(IMAGE):$(TAG)-$(_ARCH) # 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 \ + 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; \ + 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 && \ + 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 @@ -73,12 +77,15 @@ rm-remote-untagged: ## delete all remote untagged and in-dev images, keep 10 tag clean:: ## clean up source folder rm-image: - test -z "$$(podman image ls -q $(IMAGE):$(TAG)-$(_ARCH))" || podman image rm -f $(IMAGE):$(TAG)-$(_ARCH) > /dev/null - test -z "$$(podman image ls -q $(IMAGE):$(TAG)-$(_ARCH))" || echo "Error: Removing image failed" + for t in $(TAG) latest $(EXTRA_TAGS); do + for a in $(ALL_ARCHS); do + podman image exists $(IMAGE):$$t-$$a && podman image rm -f $(IMAGE):$$t-$$a || true + done + done ## some useful tasks during development ci-pull-upstream: ## pull latest shared .ci subtree - git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash -m "Merge latest ci-tools-lib" + git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git main --squash -m "Merge latest ci-tools-lib" create-repo: ## create new AWS ECR public repository aws ecr-public create-repository --repository-name $(IMAGE) --region $(REGION)