From d0d96b52bf1d5ff8ff65f3376f27e049a8375377 Mon Sep 17 00:00:00 2001 From: anirban Date: Sun, 23 Nov 2025 21:51:40 +0530 Subject: [PATCH 1/5] Add auto-docker labels from the metadata --- .github/workflows/add-docker-labels.yml | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/add-docker-labels.yml diff --git a/.github/workflows/add-docker-labels.yml b/.github/workflows/add-docker-labels.yml new file mode 100644 index 00000000000..3201ddcbc1d --- /dev/null +++ b/.github/workflows/add-docker-labels.yml @@ -0,0 +1,33 @@ + +name: Add Docker Labels and Build + +on: + push: + branches: [ main ] + +jobs: + label-and-build: + runs-on: ubuntu-latest + steps: + - name: Get the code + uses: actions/checkout@v4 + + - name: Read metadata file + id: readmeta + run: | + echo "VERSION=$(jq -r '.version' metadata.json)" >> $GITHUB_OUTPUT + echo "COMMIT=$(jq -r '.commit' metadata.json)" >> $GITHUB_OUTPUT + echo "REPO=$(jq -r '.repo' metadata.json)" >> $GITHUB_OUTPUT + echo "DESC=$(jq -r '.description' metadata.json)" >> $GITHUB_OUTPUT + + - name: Create labels string + id: make_labels + run: | + echo "labels=org.opencontainers.image.version=${{ steps.readmeta.outputs.VERSION }},org.opencontainers.image.revision=${{ steps.readmeta.outputs.COMMIT }},org.opencontainers.image.source=${{ steps.readmeta.outputs.REPO }},org.opencontainers.image.description=\"${{ steps.readmeta.outputs.DESC }}\"" >> $GITHUB_OUTPUT + + - name: Build image with labels (no push) + uses: docker/build-push-action@v6 + with: + context: . + push: false + labels: ${{ steps.make_labels.outputs.labels }} From 7009a56e4cf9a7eb6244b876857ddafb1cea4cc8 Mon Sep 17 00:00:00 2001 From: anirban Date: Sun, 23 Nov 2025 22:32:18 +0530 Subject: [PATCH 2/5] Add auto-docker labels from the metadata --- .github/workflows/add-docker-labels.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/add-docker-labels.yml b/.github/workflows/add-docker-labels.yml index 3201ddcbc1d..e157f35bf8a 100644 --- a/.github/workflows/add-docker-labels.yml +++ b/.github/workflows/add-docker-labels.yml @@ -1,9 +1,7 @@ name: Add Docker Labels and Build -on: - push: - branches: [ main ] +on: [push] jobs: label-and-build: @@ -15,10 +13,10 @@ jobs: - name: Read metadata file id: readmeta run: | - echo "VERSION=$(jq -r '.version' metadata.json)" >> $GITHUB_OUTPUT - echo "COMMIT=$(jq -r '.commit' metadata.json)" >> $GITHUB_OUTPUT - echo "REPO=$(jq -r '.repo' metadata.json)" >> $GITHUB_OUTPUT - echo "DESC=$(jq -r '.description' metadata.json)" >> $GITHUB_OUTPUT + echo "VERSION=$(jq -r '.version' ../../metadata.json)" >> $GITHUB_OUTPUT + echo "COMMIT=$(jq -r '.commit' ../../metadata.json)" >> $GITHUB_OUTPUT + echo "REPO=$(jq -r '.repo' ../../metadata.json)" >> $GITHUB_OUTPUT + echo "DESC=$(jq -r '.description' ../../metadata.json)" >> $GITHUB_OUTPUT - name: Create labels string id: make_labels From c00a6426e4114dd8b37c221438162412b878dcff Mon Sep 17 00:00:00 2001 From: anirban Date: Mon, 24 Nov 2025 23:23:58 +0530 Subject: [PATCH 3/5] Updated docker.yml with labels --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cdbddd0d35e..2990e445a08 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -165,6 +165,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} file: docker/${{ matrix.os }}/Dockerfile annotations: ${{ steps.meta.outputs.annotations }} + labels: ${{ steps.meta.outputs.labels }} provenance: mode=max sbom: true # Don't use cache for releases. From 2c625848606ae216f6b6d12ac965230bda0b4f0f Mon Sep 17 00:00:00 2001 From: anirban Date: Wed, 26 Nov 2025 13:43:53 +0530 Subject: [PATCH 4/5] Remove accidental workflow file --- .github/workflows/add-docker-labels.yml | 31 ------------------------- 1 file changed, 31 deletions(-) delete mode 100644 .github/workflows/add-docker-labels.yml diff --git a/.github/workflows/add-docker-labels.yml b/.github/workflows/add-docker-labels.yml deleted file mode 100644 index e157f35bf8a..00000000000 --- a/.github/workflows/add-docker-labels.yml +++ /dev/null @@ -1,31 +0,0 @@ - -name: Add Docker Labels and Build - -on: [push] - -jobs: - label-and-build: - runs-on: ubuntu-latest - steps: - - name: Get the code - uses: actions/checkout@v4 - - - name: Read metadata file - id: readmeta - run: | - echo "VERSION=$(jq -r '.version' ../../metadata.json)" >> $GITHUB_OUTPUT - echo "COMMIT=$(jq -r '.commit' ../../metadata.json)" >> $GITHUB_OUTPUT - echo "REPO=$(jq -r '.repo' ../../metadata.json)" >> $GITHUB_OUTPUT - echo "DESC=$(jq -r '.description' ../../metadata.json)" >> $GITHUB_OUTPUT - - - name: Create labels string - id: make_labels - run: | - echo "labels=org.opencontainers.image.version=${{ steps.readmeta.outputs.VERSION }},org.opencontainers.image.revision=${{ steps.readmeta.outputs.COMMIT }},org.opencontainers.image.source=${{ steps.readmeta.outputs.REPO }},org.opencontainers.image.description=\"${{ steps.readmeta.outputs.DESC }}\"" >> $GITHUB_OUTPUT - - - name: Build image with labels (no push) - uses: docker/build-push-action@v6 - with: - context: . - push: false - labels: ${{ steps.make_labels.outputs.labels }} From 29d46be0fa10b14505ea7c409efadee30fc79e92 Mon Sep 17 00:00:00 2001 From: anirban Date: Wed, 26 Nov 2025 13:49:55 +0530 Subject: [PATCH 5/5] add labels from metadata --- .github/workflows/docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2990e445a08..d54f97e9f4b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -199,3 +199,5 @@ jobs: subject-name: ghcr.io/${{ github.repository }} subject-digest: ${{ steps.docker_build.outputs.digest }} push-to-registry: ${{ github.event_name != 'pull_request' }} + +