Merge commit '989846e69d8d41dcaf4310a54e2ea44a7badb3a7' into v1.24
This commit is contained in:
commit
af5dc03e36
@ -2,6 +2,7 @@
|
|||||||
GTAG=$(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
|
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/-$$//')
|
TAG ?= $(shell echo $(GTAG) | awk -F '-' '{ print $$1 "-" $$2 }' | sed -e 's/-$$//')
|
||||||
ARCH := amd64
|
ARCH := amd64
|
||||||
|
ALL_ARCHS := amd64 arm64
|
||||||
|
|
||||||
# EXTRA_TAGS supposed to be set at the caller, eg. $(shell echo $(TAG) | awk -F '.' '{ print $$1 "." $$2 }')
|
# EXTRA_TAGS supposed to be set at the caller, eg. $(shell echo $(TAG) | awk -F '.' '{ print $$1 "." $$2 }')
|
||||||
|
|
||||||
@ -32,15 +33,17 @@ scan: ## Scan image using trivy
|
|||||||
echo "Scanning $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) using Trivy $(TRIVY_REMOTE)"
|
echo "Scanning $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) using Trivy $(TRIVY_REMOTE)"
|
||||||
trivy image $(TRIVY_OPTS) $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH)
|
trivy image $(TRIVY_OPTS) $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH)
|
||||||
|
|
||||||
# We create new manifest and add TAG-ARCH image
|
# first tag and push all actual images
|
||||||
# if manigest exists already, get it and add TAG-ARCH to eg. add arm64 to existing amd64
|
# create new manifest for each tag and add all available TAG-ARCH before pushing
|
||||||
push: ## push images to registry
|
push: ecr-login ## push images to registry
|
||||||
for t in $(TAG) latest $(EXTRA_TAGS); \
|
for t in $(TAG) latest $(EXTRA_TAGS); do \
|
||||||
do echo "creating and pushing: $$t"; \
|
[ "$$t" != "$(TAG)" ] && podman tag $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) $(REGISTRY)/$(IMAGE):$${t}-$(ARCH); \
|
||||||
docker tag $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) $(REGISTRY)/$(IMAGE):$${t}-$(ARCH) && \
|
podman manifest exists $(IMAGE):$$t && podman manifest rm $(IMAGE):$$t; \
|
||||||
docker push $(REGISTRY)/$(IMAGE):$${t}-$(ARCH); \
|
podman manifest create $(IMAGE):$$t; \
|
||||||
podman manifest exists $(IMAGE):$$t || podman manifest create $(IMAGE):$$t; \
|
for a in $(ALL_ARCHS); do \
|
||||||
buildah manifest add $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$(TAG)-$(ARCH) && docker manifest push $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$$t; \
|
podman manifest add $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$(TAG)-$$a; \
|
||||||
|
done; \
|
||||||
|
podman manifest push $(IMAGE):$$t $(REGISTRY)/$(IMAGE):$$t; \
|
||||||
done
|
done
|
||||||
|
|
||||||
ecr-login: ## log into AWS ECR public
|
ecr-login: ## log into AWS ECR public
|
||||||
|
Loading…
Reference in New Issue
Block a user