refactor: remove setting arg default via env value

Signed-off-by: KevFan <[email protected]>
Kuadrant · Sep 19, 2024 · 8031ad1 · 8031ad1
1 parent 64b0dd2
commit 8031ad1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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