From 71f4de5a995c84ca3912c2954d7fce6c314a5fde Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 13 May 2022 14:10:47 +0200 Subject: [PATCH] Squashed '.ci/' changes from bc72735..dc2c208 dc2c208 fix: use absolute image URLs for some tasks git-subtree-dir: .ci git-subtree-split: dc2c2082c0a9d6f2f75190f5957c92c3c3507344 --- podman.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/podman.mk b/podman.mk index 9336b4c5..95c2fc72 100644 --- a/podman.mk +++ b/podman.mk @@ -14,18 +14,18 @@ all: test build: - @docker image exists $(IMAGE):$(TAG) || \ - docker build --rm -t $(IMAGE):$(TAG) --build-arg TAG=$(TAG) . + @docker image exists $(REGISTRY)/$(IMAGE):$(TAG) || \ + docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG) --build-arg TAG=$(TAG) . test: build rm-test-image @test -f Dockerfile.test && \ - { docker build --rm -t $(IMAGE):$(TAG)-test --from=$(IMAGE):$(TAG) -f Dockerfile.test . && \ - docker run --rm --env-host -t $(IMAGE):$(TAG)-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; } || \ echo "No Dockerfile.test found, skipping test" scan: build - @echo "Scanning $(IMAGE):$(TAG) using Trivy" - @trivy $(TRIVY_OPTS) $(IMAGE):$(TAG) + @echo "Scanning $(REGISTRY)/$(IMAGE):$(TAG) using Trivy" + @trivy $(TRIVY_OPTS) $(REGISTRY)/$(IMAGE):$(TAG) push: build @aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY)