From 065ea1bda0fbabcc73311e521b466e0252d1d4f4 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 11 Feb 2022 23:22:25 +0100 Subject: [PATCH] Squashed '.ci/' changes from b9aa3de..ba73be4 ba73be4 feat: make Dockerfile.test optional, improve messaging git-subtree-dir: .ci git-subtree-split: ba73be47ccc9c6f9b4aeeb6c369f85781b69eaf1 --- podman.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/podman.mk b/podman.mk index ebb5a90..fb68db6 100644 --- a/podman.mk +++ b/podman.mk @@ -14,14 +14,17 @@ all: test build: - docker image exists $(IMAGE):$(TAG) || \ + @docker image exists $(IMAGE):$(TAG) || \ docker build --rm -t $(IMAGE):$(TAG) --build-arg TAG=$(TAG) . test: build rm-test-image - docker build --rm -t $(IMAGE):$(TAG)-test --from=$(IMAGE):$(TAG) -f Dockerfile.test . + @test -f Dockerfile.test && \ + docker build --rm -t $(IMAGE):$(TAG)-test --from=$(IMAGE):$(TAG) -f Dockerfile.test . || \ + echo "No Dockerfile.test found, skipping test" scan: build - trivy $(TRIVY_OPTS) $(IMAGE):$(TAG) + @echo "Scanning $(IMAGE):$(TAG) using Trivy" + @trivy $(TRIVY_OPTS) $(IMAGE):$(TAG) push: scan @aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY) @@ -34,7 +37,8 @@ clean: rm-test-image rm-image # Delete all untagged images .PHONY: rm-remote-untagged rm-remote-untagged: - 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) + @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) .PHONY: rm-image rm-image: