diff --git a/Makefile b/Makefile index 11a6eac1c..141c6b7c4 100644 --- a/Makefile +++ b/Makefile @@ -390,7 +390,7 @@ bundle: $(OPM) $(YQ) manifests dependencies-manifests kustomize operator-sdk ## $(call update-operator-dependencies,dns-operator,$(DNS_OPERATOR_BUNDLE_IMG)) $(OPERATOR_SDK) bundle validate ./bundle $(MAKE) bundle-ignore-createdAt - echo "$$QUAY_DOCKERFILE_LABEL" >> bundle.Dockerfile + echo "$$QUAY_EXPIRY_TIME_LABEL" >> bundle.Dockerfile .PHONY: bundle-ignore-createdAt bundle-ignore-createdAt: diff --git a/make/catalog.mk b/make/catalog.mk index e2c7d4193..c350e848a 100644 --- a/make/catalog.mk +++ b/make/catalog.mk @@ -11,14 +11,14 @@ CATALOG_DOCKERFILE = $(PROJECT_PATH)/catalog/kuadrant-operator-catalog.Dockerfil QUAY_IMAGE_EXPIRY ?= never # A LABEL that can be appended to a generated Dockerfile to set the Quay image expiration through Docker arguments. -define QUAY_DOCKERFILE_LABEL +define QUAY_EXPIRY_TIME_LABEL # Quay image expiry ARG QUAY_IMAGE_EXPIRY ENV QUAY_IMAGE_EXPIRY=$${QUAY_IMAGE_EXPIRY:-never} LABEL quay.expires-after=$${QUAY_IMAGE_EXPIRY} endef -export QUAY_DOCKERFILE_LABEL +export QUAY_EXPIRY_TIME_LABEL $(CATALOG_DOCKERFILE): $(OPM) -mkdir -p $(PROJECT_PATH)/catalog/kuadrant-operator-catalog