From 8031ad1d19cfcd61bb016db22a2ea58c1633b5b0 Mon Sep 17 00:00:00 2001 From: KevFan Date: Thu, 19 Sep 2024 13:50:53 +0100 Subject: [PATCH] refactor: remove setting arg default via env value Signed-off-by: KevFan --- Dockerfile | 3 +-- bundle.Dockerfile | 3 +-- make/catalog.mk | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8047a89..2ac6bc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,8 +32,7 @@ COPY --from=builder /workspace/manager . USER 65532:65532 # Quay image expiry -ARG QUAY_IMAGE_EXPIRY -ENV QUAY_IMAGE_EXPIRY=${QUAY_IMAGE_EXPIRY:-never} +ARG QUAY_IMAGE_EXPIRY=never LABEL quay.expires-after=$QUAY_IMAGE_EXPIRY ENTRYPOINT ["/manager"] diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 0806175..78e7089 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -20,6 +20,5 @@ COPY bundle/metadata /metadata/ COPY bundle/tests/scorecard /tests/scorecard/ # Quay image expiry -ARG QUAY_IMAGE_EXPIRY -ENV QUAY_IMAGE_EXPIRY=${QUAY_IMAGE_EXPIRY:-never} +ARG QUAY_IMAGE_EXPIRY=never LABEL quay.expires-after=${QUAY_IMAGE_EXPIRY} diff --git a/make/catalog.mk b/make/catalog.mk index 731ecd5..73f6835 100644 --- a/make/catalog.mk +++ b/make/catalog.mk @@ -13,8 +13,7 @@ QUAY_IMAGE_EXPIRY ?= never define QUAY_EXPIRY_TIME_LABEL # Quay image expiry -ARG QUAY_IMAGE_EXPIRY -ENV QUAY_IMAGE_EXPIRY=$${QUAY_IMAGE_EXPIRY:-never} +ARG QUAY_IMAGE_EXPIRY=never LABEL quay.expires-after=$${QUAY_IMAGE_EXPIRY} endef export QUAY_EXPIRY_TIME_LABEL