From fa5628ce6211dbab7ad1d7601217cb35372972e2 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 27 Oct 2022 14:16:35 +0200 Subject: [PATCH] Squashed '.ci/' changes from 01df38b..80dabc2 80dabc2 feat: remove implicit dependencies, add help target, cleanup 5554972 feat: multi-arch container images da15d68 feat: handle nothing to cleanup gracefully git-subtree-dir: .ci git-subtree-split: 80dabc23d16b1ff834bb4cb2e396e841c648156e --- podman.mk | 79 ++++++++++++++++++++++------------------- vars/buildPodman.groovy | 2 +- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/podman.mk b/podman.mk index 626ad4f..f1794c8 100644 --- a/podman.mk +++ b/podman.mk @@ -1,64 +1,69 @@ # 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 # 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 -.PHONY: build test scan push clean +.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 -all: test +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: - @docker image exists $(REGISTRY)/$(IMAGE):$(TAG) || \ - docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG) --build-arg TAG=$(TAG) . +build: ## Build the app + docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) --build-arg TAG=$(TAG) --build-arg ARCH=$(ARCH) --platform linux/$(ARCH) . -test: build rm-test-image - @test -f Dockerfile.test && \ - { docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG)-test --from=$(REGISTRY)/$(IMAGE):$(TAG) -f Dockerfile.test . && \ - docker run --rm --env-host -t $(REGISTRY)/$(IMAGE):$(TAG)-test; } || \ +test: rm-test-image ## Execute Dockerfile.test + 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; } || \ echo "No Dockerfile.test found, skipping test" -scan: build - @echo "Scanning $(REGISTRY)/$(IMAGE):$(TAG) using Trivy" - @trivy image $(TRIVY_OPTS) $(REGISTRY)/$(IMAGE):$(TAG) +scan: ## Scan image using trivy + echo "Scanning $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) using Trivy $(TRIVY_REMOTE)" + trivy image $(TRIVY_OPTS) $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) -push: ecr-login build - @for t in $(TAG) latest $(EXTRA_TAGS); do echo "tag and push: $$t"; docker tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$$t && docker push $(REGISTRY)/$(IMAGE):$$t; done +# 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; \ + 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) | docker 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)" - @aws ecr-public batch-delete-image --repository-name $(IMAGE) --region $(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) +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))" || docker image rm -f $(IMAGE):$(TAG) > /dev/null - @test -z "$$(docker image ls -q $(IMAGE):$(TAG))" || echo "Error: Removing image failed" + 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" # 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)-test)" || docker image rm -f $(IMAGE):$(TAG)-test > /dev/null - @test -z "$$(docker image ls -q $(IMAGE):$(TAG)-test)" || echo "Error: Removing test image failed" + 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" -# 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..0a3a539 100644 --- a/vars/buildPodman.groovy +++ b/vars/buildPodman.groovy @@ -62,7 +62,7 @@ def call(Map config=[:]) { // Push to ECR stage('Push') { steps { - sh 'make push' + sh 'make ecr-login push' } }