chore(ci): added git short hash to docker images tags (#8152)

Author: dotansimha

.github/workflows/build-and-dockerize.yaml

@@ -158,6 +158,17 @@ jobs:
           string: ${{ github.ref }}-${{ inputs.targets }}-${{ matrix.platform }}
           replace-with: '_'
 
+      - name: docker image short sha
+        id: git_hash
+        run: |
+          # if in a PR, use the PR SHA; otherwise, use the commit SHA
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+              FULL_PR_SHA=${{ github.event.pull_request.head.sha }}
+              echo "sha_short=${FULL_PR_SHA:0:7}" >> $GITHUB_OUTPUT
+          else
+              echo "sha_short=${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
+          fi
+
       - name: build docker images (${{ matrix.platform }})
         timeout-minutes: 60
         id: docker-bake
@@ -166,6 +177,7 @@ jobs:
         env:
           DOCKER_REGISTRY: ${{ inputs.registry }}/${{ inputs.imageName }}/
           COMMIT_SHA: ${{ inputs.imageTag }}
+          COMMIT_SHORT_SHA: ${{ steps.git_hash.outputs.sha_short }}
           RELEASE: ${{ inputs.imageTag }}
           BRANCH_NAME: ${{ steps.branch_name_fix.outputs.replaced }}
           BUILD_TYPE: 'publish'
@@ -192,13 +204,13 @@ jobs:
         with:
           header: ${{ github.workflow }}
           message: |
-            🐋 This PR was built and pushed to the following [Docker images](https://github.com/graphql-hive?ecosystem=container&tab=packages&visibility=public):
+            🐋 This PR was built and pushed to the following [Docker images](https://github.com/orgs/graphql-hive/packages?ecosystem=container&repo_name=console):
 
             **Targets**: `${{ inputs.targets }}`
 
             **Platforms**: `${{ matrix.platform }}`
 
-            **Image Tag**: `${{ inputs.imageTag }}`
+            **Image Tags**: `${{ inputs.imageTag }}`, `${{ steps.git_hash.outputs.sha_short }}`
 
       - name: upload sourcemaps to Sentry
         if: ${{ inputs.publishSourceMaps }}
@@ -249,6 +261,36 @@ jobs:
               docker manifest push $image_name
           done
 
+      - name: docker image short sha
+        id: git_hash
+        run: |
+          # if in a PR, use the PR SHA; otherwise, use the commit SHA
+          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+              FULL_PR_SHA=${{ github.event.pull_request.head.sha }}
+              echo "sha_short=${FULL_PR_SHA:0:7}" >> $GITHUB_OUTPUT
+          else
+              echo "sha_short=${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: 'publish docker multiarch manifest (tag: ${{ steps.git_hash.outputs.sha_short }})'
+        env:
+          TARGETS: ${{ inputs.targets }}
+          REGISTRY: ${{ inputs.registry }}
+          IMAGE_NAME: ${{ inputs.imageName }}
+          IMAGE_TAG: ${{ steps.git_hash.outputs.sha_short }}
+        run: |
+          targets=$(docker buildx bake -f docker/docker.hcl --print "$TARGETS" | jq -r '.group."'"$TARGETS"'".targets[]')
+
+          for target in $targets
+          do
+              echo "publishing multi-arch manifest for $target"
+              image_name="$REGISTRY/$IMAGE_NAME/$target:$IMAGE_TAG"
+              echo "image name: $image_name"
+
+              docker manifest create $image_name --amend "$image_name-arm64" --amend "$image_name-amd64"
+              docker manifest push $image_name
+          done
+
       - name: 'publish docker multiarch manifest (tag: latest)'
         if: ${{ inputs.publishLatest }}
         env:

docker/docker.hcl

@@ -14,6 +14,10 @@ variable "COMMIT_SHA" {
   default = ""
 }
 
+variable "COMMIT_SHORT_SHA" {
+  default = ""
+}
+
 variable "BRANCH_NAME" {
   default = ""
 }
@@ -126,6 +130,7 @@ target "schema" {
     local_image_tag("schema"),
     stable_image_tag("schema"),
     image_tag("schema", COMMIT_SHA),
+    image_tag("schema", COMMIT_SHORT_SHA),
     image_tag("schema", BRANCH_NAME)
   ]
 }
@@ -147,6 +152,7 @@ target "policy" {
     local_image_tag("policy"),
     stable_image_tag("policy"),
     image_tag("policy", COMMIT_SHA),
+    image_tag("policy", COMMIT_SHORT_SHA),
     image_tag("policy", BRANCH_NAME)
   ]
 }
@@ -168,6 +174,7 @@ target "server" {
     local_image_tag("server"),
     stable_image_tag("server"),
     image_tag("server", COMMIT_SHA),
+    image_tag("server", COMMIT_SHORT_SHA),
     image_tag("server", BRANCH_NAME)
   ]
 }
@@ -186,6 +193,7 @@ target "storage" {
     local_image_tag("storage"),
     stable_image_tag("storage"),
     image_tag("storage", COMMIT_SHA),
+    image_tag("storage", COMMIT_SHORT_SHA),
     image_tag("storage", BRANCH_NAME)
   ]
 }
@@ -207,6 +215,7 @@ target "commerce" {
     local_image_tag("commerce"),
     stable_image_tag("commerce"),
     image_tag("commerce", COMMIT_SHA),
+    image_tag("commerce", COMMIT_SHORT_SHA),
     image_tag("commerce", BRANCH_NAME)
   ]
 }
@@ -228,6 +237,7 @@ target "tokens" {
     local_image_tag("tokens"),
     stable_image_tag("tokens"),
     image_tag("tokens", COMMIT_SHA),
+    image_tag("tokens", COMMIT_SHORT_SHA),
     image_tag("tokens", BRANCH_NAME)
   ]
 }
@@ -249,6 +259,7 @@ target "usage-ingestor" {
     local_image_tag("usage-ingestor"),
     stable_image_tag("usage-ingestor"),
     image_tag("usage-ingestor", COMMIT_SHA),
+    image_tag("usage-ingestor", COMMIT_SHORT_SHA),
     image_tag("usage-ingestor", BRANCH_NAME)
   ]
 }
@@ -270,6 +281,7 @@ target "usage" {
     local_image_tag("usage"),
     stable_image_tag("usage"),
     image_tag("usage", COMMIT_SHA),
+    image_tag("usage", COMMIT_SHORT_SHA),
     image_tag("usage", BRANCH_NAME)
   ]
 }
@@ -291,6 +303,7 @@ target "workflows" {
     local_image_tag("workflows"),
     stable_image_tag("workflows"),
     image_tag("workflows", COMMIT_SHA),
+    image_tag("workflows", COMMIT_SHORT_SHA),
     image_tag("workflows", BRANCH_NAME)
   ]
 }
@@ -312,6 +325,7 @@ target "composition-federation-2" {
     local_image_tag("composition-federation-2"),
     stable_image_tag("composition-federation-2"),
     image_tag("composition-federation-2", COMMIT_SHA),
+    image_tag("composition-federation-2", COMMIT_SHORT_SHA),
     image_tag("composition-federation-2", BRANCH_NAME)
   ]
 }
@@ -333,6 +347,7 @@ target "app" {
     local_image_tag("app"),
     stable_image_tag("app"),
     image_tag("app", COMMIT_SHA),
+    image_tag("app", COMMIT_SHORT_SHA),
     image_tag("app", BRANCH_NAME)
   ]
 }
@@ -348,6 +363,7 @@ target "otel-collector" {
     local_image_tag("otel-collector"),
     stable_image_tag("otel-collector"),
     image_tag("otel-collector", COMMIT_SHA),
+    image_tag("otel-collector", COMMIT_SHORT_SHA),
     image_tag("otel-collector", BRANCH_NAME)
   ]
 }
@@ -365,6 +381,7 @@ target "cli" {
     local_image_tag("cli"),
     stable_image_tag("cli"),
     image_tag("cli", COMMIT_SHA),
+    image_tag("cli", COMMIT_SHORT_SHA),
     image_tag("cli", BRANCH_NAME)
   ]
 }