Merge pull request #230 from tomtom-international/lsi/fix-release-image-version

LSI-31 Build release image from bumped commit instead of retagging main

Author: carlosprietofernandez-tomtom

.github/workflows/release.yml

@@ -5,10 +5,6 @@ on:
     branches:
       - main
 
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
 permissions:
   contents: write
   packages: write
@@ -52,69 +48,33 @@ jobs:
           version=$(yq -r '.version' package.json)
           echo "version=$version" >> $GITHUB_OUTPUT
 
+  # Build the release image directly from the version-bump commit that triggered
+  # this workflow, so the version baked into the image (src/version.ts, generated
+  # from package.json at build time) matches the release tag. Previously this job
+  # retagged the pre-bump `main` image, which left the image reporting the prior
+  # version. Mirrors the build.yml invocation, adding the versioned + latest tags.
   tag-release-image:
-    runs-on: ubuntu-22.04
     needs: [get-version]
-    steps:
-      - name: Log in to Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
+    permissions:
+      contents: read
+      packages: write
+    uses: docker/github-builder/.github/workflows/build.yml@v1
+    with:
+      output: image
+      push: true
+      platforms: linux/amd64,linux/arm64
+      meta-images: ghcr.io/${{ github.repository }}
+      meta-tags: |
+        type=raw,value=v${{ needs.get-version.outputs.version }}
+        type=raw,value=latest
+      sign: false
+      cache: true
+    secrets:
+      registry-auths: |
+        - registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Get latest main SHA tag from package repository
-        id: get-sha
-        run: |
-          REPO_OWNER="${{ github.repository_owner }}"
-          REPO_NAME="$(basename ${{ github.repository }})"
-
-          # Check if the repo belongs to an org or user
-          TYPE_CHECK=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-            -H "Accept: application/vnd.github.v3+json" \
-            "https://api.github.com/users/${REPO_OWNER}" | \
-            jq -r '.type')
-
-          if [[ "$TYPE_CHECK" == "Organization" ]]; then
-            OWNER_TYPE="orgs"
-          else
-            OWNER_TYPE="users"
-          fi
-
-          MAIN_SHA=$(curl -s -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
-            -H "Accept: application/vnd.github.v3+json" \
-            "https://api.github.com/${OWNER_TYPE}/${REPO_OWNER}/packages/container/${REPO_NAME}/versions" | \
-            jq -r '.[] | select(.metadata.container.tags | index("main")) | .metadata.container.tags[]' | grep '^sha-')
-          echo "main_sha=$MAIN_SHA" >> $GITHUB_OUTPUT
-          echo "Main SHA: $MAIN_SHA"
-
-      - name: Pull, retag and push release image
-        run: |
-          # Ensure image names are all lowercase
-          REPO_NAME_LOWER=$(echo "${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]')
-
-          # Source image with SHA tag
-          SOURCE_IMAGE="${{ env.REGISTRY }}/${REPO_NAME_LOWER}:${{ steps.get-sha.outputs.main_sha }}"
-          # Target image with release tag
-          TARGET_IMAGE="${{ env.REGISTRY }}/${REPO_NAME_LOWER}:v${{ needs.get-version.outputs.version }}"
-          # Latest tag
-          LATEST_IMAGE="${{ env.REGISTRY }}/${REPO_NAME_LOWER}:latest"
-
-          echo "Pulling source image: $SOURCE_IMAGE"
-          docker pull $SOURCE_IMAGE
-
-          echo "Tagging as: $TARGET_IMAGE"
-          docker tag $SOURCE_IMAGE $TARGET_IMAGE
-
-          echo "Tagging as: $LATEST_IMAGE"
-          docker tag $SOURCE_IMAGE $LATEST_IMAGE
-
-          echo "Pushing release image: $TARGET_IMAGE"
-          docker push $TARGET_IMAGE
-
-          echo "Pushing latest image: $LATEST_IMAGE"
-          docker push $LATEST_IMAGE
-
   add-release-artifacts:
     runs-on: ubuntu-22.04
     needs: [tag-release-image, get-version]