From 74963d3be70df0c6c3e35b3cb3e5513bb0d06029 Mon Sep 17 00:00:00 2001 From: russlan23 Date: Thu, 6 Aug 2026 11:09:37 +0400 Subject: [PATCH] feat(calm-hub): tag Docker images with project version Signed-off-by: russlan23 --- .../workflows/docker-publish-calm-hub-native.yml | 15 +++++++++++++++ .../docker-publish-calm-hub-readonly-native.yml | 15 +++++++++++++++ .../docker-publish-calm-hub-readonly.yml | 6 ++++++ .github/workflows/docker-publish-calm-hub.yml | 6 ++++++ 4 files changed, 42 insertions(+) diff --git a/.github/workflows/docker-publish-calm-hub-native.yml b/.github/workflows/docker-publish-calm-hub-native.yml index 6070be443..b59c40e63 100644 --- a/.github/workflows/docker-publish-calm-hub-native.yml +++ b/.github/workflows/docker-publish-calm-hub-native.yml @@ -170,6 +170,20 @@ jobs: needs: build steps: + - name: Checkout + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6 + + - name: Set up JDK + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: 'temurin' + java-version: '21' + + - name: Resolve CALM Hub version + id: version + working-directory: calm-hub + run: echo "value=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_OUTPUT" + - name: Download digests uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 with: @@ -193,6 +207,7 @@ jobs: images: ${{ secrets.DOCKER_USERNAME }}/calm-hub tags: | type=raw,value=${{ github.event.inputs.tag || 'latest-native' }} + type=raw,value=${{ steps.version.outputs.value }}-native type=sha,format=short,suffix=-native type=ref,event=tag,suffix=-native diff --git a/.github/workflows/docker-publish-calm-hub-readonly-native.yml b/.github/workflows/docker-publish-calm-hub-readonly-native.yml index b3b0b6cfb..b676b7e36 100644 --- a/.github/workflows/docker-publish-calm-hub-readonly-native.yml +++ b/.github/workflows/docker-publish-calm-hub-readonly-native.yml @@ -164,6 +164,20 @@ jobs: needs: build steps: + - name: Checkout + uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6 + + - name: Set up JDK + uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 + with: + distribution: 'temurin' + java-version: '21' + + - name: Resolve CALM Hub version + id: version + working-directory: calm-hub + run: echo "value=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_OUTPUT" + - name: Download digests uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4 with: @@ -187,6 +201,7 @@ jobs: images: ${{ secrets.DOCKER_USERNAME }}/calm-hub tags: | type=raw,value=${{ github.event.inputs.tag || 'latest-read-only-native' }} + type=raw,value=${{ steps.version.outputs.value }}-read-only-native type=sha,format=short,suffix=-read-only-native type=ref,event=tag,suffix=-read-only-native diff --git a/.github/workflows/docker-publish-calm-hub-readonly.yml b/.github/workflows/docker-publish-calm-hub-readonly.yml index 9ffb48af3..d00629376 100644 --- a/.github/workflows/docker-publish-calm-hub-readonly.yml +++ b/.github/workflows/docker-publish-calm-hub-readonly.yml @@ -56,6 +56,11 @@ jobs: - name: Build and stage seed content run: bash calm-hub/build-readonly-image.sh --no-docker + - name: Resolve CALM Hub version + id: version + working-directory: calm-hub + run: echo "value=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_OUTPUT" + # Step 5: Set up Docker Buildx for multi-architecture builds - name: Set up Docker Buildx uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3 @@ -75,6 +80,7 @@ jobs: images: ${{ secrets.DOCKER_USERNAME }}/calm-hub tags: | type=raw,value=${{ github.event.inputs.tag || 'latest-read-only-static' }} + type=raw,value=${{ steps.version.outputs.value }}-read-only-static type=sha,format=short,suffix=-read-only-static type=ref,event=tag,suffix=-read-only-static diff --git a/.github/workflows/docker-publish-calm-hub.yml b/.github/workflows/docker-publish-calm-hub.yml index 2cc050a7f..3d9da62d4 100644 --- a/.github/workflows/docker-publish-calm-hub.yml +++ b/.github/workflows/docker-publish-calm-hub.yml @@ -55,6 +55,11 @@ jobs: working-directory: calm-hub run: mvn -P integration clean package -Ddependency-check.skip=true + - name: Resolve CALM Hub version + id: version + working-directory: calm-hub + run: echo "value=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> "$GITHUB_OUTPUT" + # Step 5: Set up Docker Buildx for multi-architecture builds - name: Set up Docker Buildx uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3 @@ -74,6 +79,7 @@ jobs: images: ${{ secrets.DOCKER_USERNAME }}/calm-hub tags: | type=raw,value=${{ github.event.inputs.tag || 'latest' }} + type=raw,value=${{ steps.version.outputs.value }} type=sha,format=short type=ref,event=branch type=ref,event=tag