diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 565ab5a..9724bf4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,6 @@ on: types: [published] env: - REGISTRY_IMAGE: rancher/hardened-calico GITHUB_ACTION_TAG: ${{ github.ref_name }} jobs: @@ -23,6 +22,7 @@ jobs: run: | echo "$(make -s log | grep TAG)" >> "$GITHUB_ENV" echo "$(make -s log | grep ARCH)" >> "$GITHUB_ENV" + echo "$(make -s log | grep REGISTRY_IMAGE)" >> "$GITHUB_ENV" - name: Print ENV values id: print_Envs diff --git a/Makefile b/Makefile index 4be92dc..eb9d711 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,8 @@ TAG := v3.29.1$(BUILD_META) endif REPO ?= rancher -REGISTRY_IMAGE ?= $(REPO)/hardened-calico -IMAGE ?= $(REGISTRY_IMAGE):$(TAG) +REGISTRY_IMAGE = $(REPO)/hardened-calico +IMAGE = $(REGISTRY_IMAGE):$(TAG) LABEL_ARGS = $(foreach label,$(META_LABELS),--label $(label)) @@ -91,6 +91,7 @@ log: @echo "ARCH=$(ARCH)" @echo "TAG=$(TAG:$(BUILD_META)=)" @echo "REPO=$(REPO)" + @echo "REGISTRY_IMAGE=$(REGISTRY_IMAGE)" @echo "PKG=$(PKG)" @echo "SRC=$(SRC)" @echo "BUILD_META=$(BUILD_META)"