Merge branch 'add-open-containers-version-label' into 'main'

chore: add org.opencontainers.image.version label See merge request fedora/bootc/base-images!252
2025-08-25 16:24:44 +00:00 · 2025-08-25 16:24:44 +00:00 · 06cc40d2e2
commit 06cc40d2e2
parent a48a6d5bda 4c4ce91d9a
37 changed files with 85 additions and 16 deletions
--- a/.tekton/fedora-bootc-42-iot-pull-request.yaml
+++ b/.tekton/fedora-bootc-42-iot-pull-request.yaml
@ -54,6 +54,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-iot:on-pr-{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-iot-push.yaml
+++ b/.tekton/fedora-bootc-42-iot-push.yaml
@ -51,6 +51,9 @@ spec:
    - MANIFEST=fedora-iot
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-iot:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-iot-renovate-push.yaml
+++ b/.tekton/fedora-bootc-42-iot-renovate-push.yaml
@ -54,6 +54,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-iot:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml
+++ b/.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml
@ -52,6 +52,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-minimal-plus:on-pr-{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-42-minimal-plus-push.yaml
@ -49,6 +49,9 @@ spec:
    - MANIFEST=fedora-minimal-plus
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-minimal-plus:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-minimal-plus-renovate-push.yaml
+++ b/.tekton/fedora-bootc-42-minimal-plus-renovate-push.yaml
@ -52,6 +52,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-minimal-plus:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-minimal-pull-request.yaml
+++ b/.tekton/fedora-bootc-42-minimal-pull-request.yaml
@ -50,6 +50,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-minimal:on-pr-{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-minimal-push.yaml
+++ b/.tekton/fedora-bootc-42-minimal-push.yaml
@ -47,6 +47,9 @@ spec:
    - MANIFEST=fedora-minimal
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-minimal:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-minimal-renovate-push.yaml
+++ b/.tekton/fedora-bootc-42-minimal-renovate-push.yaml
@ -50,6 +50,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-minimal:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-standard-pull-request.yaml
+++ b/.tekton/fedora-bootc-42-standard-pull-request.yaml
@ -54,6 +54,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-standard:on-pr-{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-standard-push.yaml
+++ b/.tekton/fedora-bootc-42-standard-push.yaml
@ -51,6 +51,9 @@ spec:
    - MANIFEST=fedora-standard
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-standard:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-42-standard-renovate-push.yaml
+++ b/.tekton/fedora-bootc-42-standard-renovate-push.yaml
@ -54,6 +54,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-42-standard:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=42
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-iot-pull-request.yaml
+++ b/.tekton/fedora-bootc-43-iot-pull-request.yaml
@ -56,7 +56,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-iot:on-pr-{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-iot-push.yaml
+++ b/.tekton/fedora-bootc-43-iot-push.yaml
@ -53,7 +53,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-iot:{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-iot-renovate-push.yaml
+++ b/.tekton/fedora-bootc-43-iot-renovate-push.yaml
@ -56,7 +56,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-iot:{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-minimal-plus-pull-request.yaml
+++ b/.tekton/fedora-bootc-43-minimal-plus-pull-request.yaml
@ -54,7 +54,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-minimal-plus:on-pr-{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-43-minimal-plus-push.yaml
@ -51,7 +51,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-minimal-plus:{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-minimal-plus-renovate-push.yaml
+++ b/.tekton/fedora-bootc-43-minimal-plus-renovate-push.yaml
@ -54,7 +54,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-minimal-plus:{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-minimal-pull-request.yaml
+++ b/.tekton/fedora-bootc-43-minimal-pull-request.yaml
@ -52,7 +52,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-minimal:on-pr-{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-minimal-push.yaml
+++ b/.tekton/fedora-bootc-43-minimal-push.yaml
@ -49,7 +49,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-minimal:{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-minimal-renovate-push.yaml
+++ b/.tekton/fedora-bootc-43-minimal-renovate-push.yaml
@ -52,7 +52,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-minimal:{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-standard-pull-request.yaml
+++ b/.tekton/fedora-bootc-43-standard-pull-request.yaml
@ -56,7 +56,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-standard:on-pr-{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-standard-push.yaml
+++ b/.tekton/fedora-bootc-43-standard-push.yaml
@ -53,7 +53,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-standard:{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-43-standard-renovate-push.yaml
+++ b/.tekton/fedora-bootc-43-standard-renovate-push.yaml
@ -56,7 +56,7 @@ spec:
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-43-standard:{{revision}}
  - name: labels
    value:
-      - org.opencontainers.version=43
+      - org.opencontainers.image.version=43
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-iot-pull-request.yaml
@ -54,6 +54,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-iot:on-pr-{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-iot-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-iot-push.yaml
@ -51,6 +51,9 @@ spec:
    - MANIFEST=fedora-iot
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-iot:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-iot-renovate-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-iot-renovate-push.yaml
@ -54,6 +54,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-iot:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml
@ -52,6 +52,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal-plus:on-pr-{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
@ -49,6 +49,9 @@ spec:
    - MANIFEST=fedora-minimal-plus
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal-plus:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-minimal-plus-renovate-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-plus-renovate-push.yaml
@ -52,6 +52,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal-plus:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml
@ -50,6 +50,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal:on-pr-{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-minimal-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-push.yaml
@ -47,6 +47,9 @@ spec:
    - MANIFEST=fedora-minimal
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-minimal-renovate-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-minimal-renovate-push.yaml
@ -50,6 +50,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-minimal:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml
+++ b/.tekton/fedora-bootc-rawhide-standard-pull-request.yaml
@ -54,6 +54,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-standard:on-pr-{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-standard-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-standard-push.yaml
@ -51,6 +51,9 @@ spec:
    - MANIFEST=fedora-standard
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-standard:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/.tekton/fedora-bootc-rawhide-standard-renovate-push.yaml
+++ b/.tekton/fedora-bootc-rawhide-standard-renovate-push.yaml
@ -54,6 +54,9 @@ spec:
    value: 5d
  - name: output-image
    value: quay.io/konflux-fedora/bootc-tenant/fedora-bootc-rawhide-standard:{{revision}}
+  - name: labels
+    value:
+      - org.opencontainers.image.version=44
  pipelineRef:
    params:
    - name: bundle
--- a/5
+++ b/5
@ -56,10 +56,7 @@ EORUN
 # This pulls in the rootfs generated in the previous step
 FROM scratch
 COPY --from=builder /target-rootfs/ /
-# Note in practice this won't be right in a cross build, so we don't
-# set it here. This placeholder is just to note that it *should* be set
-# by the larger build system (e.g. Konflux).
-LABEL org.opencontainers.image.version 43
+
 LABEL containers.bootc 1
 # This is an ad-hoc way for us to reference bootc-image-builder in
 # a way that in theory client tooling can inspect and find. Today