diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 30f90e7..7162fe0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,13 +53,11 @@ jobs: tag: ${{ github.event.release.tag_name }} platforms: linux/amd64 - push-to-public: false public-repo: mgfritch public-registry: ${{ env.PUBLIC_REGISTRY }} public-username: ${{ env.DOCKER_USERNAME }} public-password: ${{ secrets.DOCKER_PASSWORD }} - push-to-prime: true prime-repo: mgfritch prime-registry: ${{ env.PRIME_REGISTRY }} prime-username: ${{ env.PRIME_REGISTRY_USERNAME }} diff --git a/Makefile b/Makefile index a836ab9..e148e97 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,10 @@ IMAGE_NAME = hardened-calico REGISTRY_IMAGE = $(REPO)/$(IMAGE_NAME) IMAGE = $(REGISTRY_IMAGE):$(TAG) -METADATA_DIR = /tmp/$(IMAGE_NAME) -METADATA_FILE = $(METADATA_DIR)/metadata-$(subst /,-,$(REGISTRY_IMAGE)).json +METADATA_DIR ?= /tmp +METADATA_FILE ?= $(METADATA_DIR)/metadata-$(subst /,-,$(REGISTRY_IMAGE)).json +mkdir -p $(METADATA_DIR) + LABEL_ARGS = $(foreach label,$(META_LABELS),--label $(label)) ifeq (,$(filter %$(BUILD_META),$(TAG)))