From 047e160d2687f1f6465ecb55dae855a2cf0ef469 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Mon, 3 Apr 2023 09:28:13 +0000 Subject: [PATCH] Squashed '.ci/' changes from 5554972..63421d1 63421d1 fix: prevent branch_name equals tag 47140c2 feat: append branch into tags if not main 4b62ada chore: improve messaging a49cc0c chore: improve messaging 194afb4 chore: get ci working again 8ec9769 chore: get ci working again fef4968 fix: do NOT push PRs to registry, other fixes 50a6d67 feat: ensure ARCH is only set to defined values 8fb40c7 fix: adjust trivy call to local podman 7378ea9 fix: fix trivy scan task to match new flow, add BRANCH env to Makefile 38cf7ab fix: more podman/buildah cleanups aece7fc fix: Improve multi-arch manifest handling 80dabc2 feat: remove implicit dependencies, add help target, cleanup git-subtree-dir: .ci git-subtree-split: 63421d1fab0d2546de343697cbd1424914db6c31 --- podman.mk | 113 ++++++++++++++++++++++------------------ vars/buildPodman.groovy | 14 ++--- 2 files changed, 70 insertions(+), 57 deletions(-) diff --git a/podman.mk b/podman.mk index b77ffe6..2ab4469 100644 --- a/podman.mk +++ b/podman.mk @@ -1,74 +1,85 @@ # Parse version from latest git semver tag -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 +GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) +GIT_TAG := $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null) -# 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) +# append branch name to tag if NOT main nor master +TAG := $(GIT_TAG) +ifeq (,$(filter main master, $(GIT_BRANCH))) + ifneq ($(GIT_TAG), $(GIT_BRANCH)) + TAG = $(GIT_TAG)-$(GIT_BRANCH) + endif endif -.PHONY: build test scan push clean ecr-login +# optionally set by the caller +EXTRA_TAGS := -all: test +ARCH := amd64 +ALL_ARCHS := amd64 arm64 +_ARCH = $(or $(filter $(ARCH),$(ALL_ARCHS)),$(error $$ARCH [$(ARCH)] must be exactly one of "$(ALL_ARCHS)")) -build: - @docker image exists $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) || \ - docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) --build-arg TAG=$(TAG) --build-arg ARCH=$(ARCH) --platform linux/$(ARCH) . +ifneq ($(TRIVY_REMOTE),) + TRIVY_OPTS := --server $(TRIVY_REMOTE) +endif -test: build rm-test-image - @test -f Dockerfile.test && \ - { docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG)-test --from=$(REGISTRY)/$(IMAGE):$(TAG) -f Dockerfile.test --platform linux/$(ARCH) . && \ - docker run --rm --env-host -t $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH)-test; } || \ +.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}' + +build: ## Build the app + buildah build --rm --layers -t $(IMAGE):$(TAG)-$(_ARCH) --build-arg TAG=$(TAG) --build-arg ARCH=$(_ARCH) --platform linux/$(_ARCH) . + +test: rm-test-image ## Execute Dockerfile.test + test -f Dockerfile.test && \ + { buildah build --rm --layers -t $(REGISTRY)/$(IMAGE):$(TAG)-test --from=$(REGISTRY)/$(IMAGE):$(TAG) -f Dockerfile.test --platform linux/$(_ARCH) . && \ + podman run --rm --env-host -t $(REGISTRY)/$(IMAGE):$(TAG)-$(_ARCH)-test; } || \ echo "No Dockerfile.test found, skipping test" -scan: build - @echo "Scanning $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) using Trivy $(TRIVY_REMOTE)" - @trivy image $(TRIVY_OPTS) $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) +scan: ## Scan image using trivy + echo "Scanning $(IMAGE):$(TAG)-$(_ARCH) using Trivy $(TRIVY_REMOTE)" + trivy image $(TRIVY_OPTS) localhost/$(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: ecr-login - @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 \ + 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 -ecr-login: - @aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY) +ecr-login: ## log into AWS ECR public + aws ecr-public get-login-password --region $(REGION) | podman login --username AWS --password-stdin $(REGISTRY) -clean: rm-test-image rm-image +clean: rm-test-image rm-image ## delete local built container and test images -# Delete all untagged images -.PHONY: rm-remote-untagged -rm-remote-untagged: - @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" +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" -.PHONY: rm-image rm-image: - @test -z "$$(docker image ls -q $(IMAGE):$(TAG)-$(ARCH))" || docker image rm -f $(IMAGE):$(TAG)-$(ARCH) > /dev/null - @test -z "$$(docker image ls -q $(IMAGE):$(TAG)-$(ARCH))" || echo "Error: Removing image failed" + 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" # Ensure we run the tests by removing any previous runs -.PHONY: rm-test-image rm-test-image: - @test -z "$$(docker image ls -q $(IMAGE):$(TAG)-$(ARCH)-test)" || docker image rm -f $(IMAGE):$(TAG)-$(ARCH)-test > /dev/null - @test -z "$$(docker image ls -q $(IMAGE):$(TAG)-$(ARCH)-test)" || echo "Error: Removing test image failed" + test -z "$$(podman image ls -q $(IMAGE):$(TAG)-$(_ARCH)-test)" || podman image rm -f $(IMAGE):$(TAG)-$(_ARCH)-test > /dev/null + test -z "$$(podman image ls -q $(IMAGE):$(TAG)-$(_ARCH)-test)" || echo "Error: Removing test image failed" -# Convience task during dev of downstream projects -.PHONY: ci-pull-upstream -ci-pull-upstream: +ci-pull-upstream: ## pull latest shared .ci subtree git stash && git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash && git stash pop -.PHONY: create-repo -create-repo: +create-repo: ## create new AWS ECR public repository aws ecr-public create-repository --repository-name $(IMAGE) --region $(REGION) - -.DEFAULT: - @echo "$@ not implemented. NOOP" diff --git a/vars/buildPodman.groovy b/vars/buildPodman.groovy index 14a1b90..e5ecff9 100644 --- a/vars/buildPodman.groovy +++ b/vars/buildPodman.groovy @@ -7,12 +7,14 @@ def call(Map config=[:]) { label 'podman-aws-trivy' } } - stages { stage('Prepare') { - // get tags steps { - sh 'git fetch -q --tags ${GIT_URL} +refs/heads/${BRANCH_NAME}:refs/remotes/origin/${BRANCH_NAME}' + // pull tags + withCredentials([gitUsernamePassword(credentialsId: 'gitea-jenkins-user')]) { + sh 'git fetch -q --tags ${GIT_URL}' + } + sh 'make prepare || true' } } @@ -36,8 +38,7 @@ def call(Map config=[:]) { TRIVY_OUTPUT = "reports/trivy.html" } steps { - sh 'mkdir -p reports' - sh 'make scan' + sh 'mkdir -p reports && make scan' publishHTML target: [ allowMissing: true, alwaysLinkToLastBuild: true, @@ -59,8 +60,9 @@ def call(Map config=[:]) { } } - // Push to ECR + // Push to container registry, skip if PR stage('Push') { + when { not { changeRequest() } } steps { sh 'make push' }