Merge 46f83ed into 676f89f

release-engineering · Feb 21, 2024 · 17aa869 · 17aa869
2 parents 676f89f + 46f83ed
commit 17aa869
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/gating.yaml b/.github/workflows/gating.yaml
@@ -162,6 +162,7 @@ jobs:
           containerfiles: Dockerfile
           build-args: |
             GITHUB_SHA=${{ github.sha }}
+            EXPIRES_AFTER=${{ github.ref == 'refs/heads/master' && 'never' || '30d' }}
 
       - name: Log in to the image registry
         if: github.event_name == 'push' && github.actor != 'dependabot[bot]'

diff --git a/Dockerfile b/Dockerfile
@@ -60,6 +60,7 @@ RUN set -ex \
 # --- Final image
 FROM scratch
 ARG GITHUB_SHA
+ARG EXPIRES_AFTER
 LABEL \
     summary="WaiverDB application" \
     description="An engine for storing waivers against test results." \
@@ -68,7 +69,8 @@ LABEL \
     url="https://github.com/release-engineering/waiverdb" \
     vcs-type="git" \
     vcs-ref=$GITHUB_SHA \
-    io.k8s.display-name="WaiverDB"
+    io.k8s.display-name="WaiverDB" \
+    quay.expires-after=$EXPIRES_AFTER
 
 ENV \
     PYTHONFAULTHANDLER=1 \