Merge commit 'ed7d37e290a8fb7b2f37f059f69b0169f4f5df2d'

This commit is contained in:
Stefan Reimer 2022-05-16 17:54:59 +02:00
commit 08aafcdc4d

View File

@ -12,7 +12,6 @@ endif
all: test all: test
build: build:
@docker image exists $(REGISTRY)/$(IMAGE):$(TAG) || \ @docker image exists $(REGISTRY)/$(IMAGE):$(TAG) || \
docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG) --build-arg TAG=$(TAG) . docker build --rm -t $(REGISTRY)/$(IMAGE):$(TAG) --build-arg TAG=$(TAG) .
@ -29,9 +28,7 @@ scan: build
push: build push: build
@aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY) @aws ecr-public get-login-password --region $(REGION) | docker login --username AWS --password-stdin $(REGISTRY)
@docker tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):latest @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
docker push $(REGISTRY)/$(IMAGE):$(TAG)
docker push $(REGISTRY)/$(IMAGE):latest
clean: rm-test-image rm-image clean: rm-test-image rm-image