use sha in image tage

Author: anthony-nhs

.github/workflows/ci.yml

@@ -136,6 +136,7 @@ jobs:
       VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
       TAG_LATEST: true
+      DOCKER_IMAGE_TAG: ${{needs.tag_release.outputs.version_tag}}
     secrets:
       CDK_PUSH_IMAGE_ROLE: ${{ secrets.DEV_CDK_PUSH_IMAGE_ROLE }}
 
@@ -153,6 +154,7 @@ jobs:
         VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
         COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
         TAG_LATEST: true
+        DOCKER_IMAGE_TAG: ${{needs.tag_release.outputs.version_tag}}
     secrets:
         CDK_PUSH_IMAGE_ROLE: ${{ secrets.QA_CDK_PUSH_IMAGE_ROLE }}
 
@@ -170,6 +172,7 @@ jobs:
         VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
         COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
         TAG_LATEST: true
+        DOCKER_IMAGE_TAG: ${{needs.tag_release.outputs.version_tag}}
     secrets:
         CDK_PUSH_IMAGE_ROLE: ${{ secrets.REF_CDK_PUSH_IMAGE_ROLE }}
 
@@ -187,6 +190,7 @@ jobs:
         VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
         COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
         TAG_LATEST: true
+        DOCKER_IMAGE_TAG: ${{needs.tag_release.outputs.version_tag}}
     secrets:
         CDK_PUSH_IMAGE_ROLE: ${{ secrets.INT_CDK_PUSH_IMAGE_ROLE }}
 
@@ -204,5 +208,6 @@ jobs:
         VERSION_NUMBER: ${{needs.tag_release.outputs.version_tag}}
         COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
         TAG_LATEST: true
+        DOCKER_IMAGE_TAG: ${{needs.tag_release.outputs.version_tag}}
     secrets:
         CDK_PUSH_IMAGE_ROLE: ${{ secrets.PROD_CDK_PUSH_IMAGE_ROLE }}

.github/workflows/docker_image_upload.yml

@@ -15,6 +15,9 @@ on:
       TAG_LATEST:
         required: true
         type: boolean
+      DOCKER_IMAGE_TAG:
+        required: true
+        type: string
     secrets:
       CDK_PUSH_IMAGE_ROLE:
         required: true

.github/workflows/pull_request.yml

@@ -46,11 +46,13 @@ jobs:
     runs-on: ubuntu-22.04
     outputs:
       commit_id: ${{ steps.commit_id.outputs.commit_id }}
+      sha_short: ${{ steps.commit_id.outputs.sha_short }}
     steps:
       - name: Get Commit ID
         id: commit_id
         run: |
           echo "commit_id=${{ github.sha }}" >> "$GITHUB_OUTPUT"
+          echo "sha_short=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
 
   package_code:
     needs: [get_issue_number, quality_checks, get_commit_id]
@@ -67,5 +69,6 @@ jobs:
       VERSION_NUMBER: PR-${{ needs.get_issue_number.outputs.issue_number }}
       COMMIT_ID: ${{ needs.get_commit_id.outputs.commit_id }}
       TAG_LATEST: false
+      DOCKER_IMAGE_TAG: PR-${{ needs.get_issue_number.outputs.issue_number }}-${{ needs.get_commit_id.outputs.sha_short }}
     secrets:
       CDK_PUSH_IMAGE_ROLE: ${{ secrets.DEV_CDK_PUSH_IMAGE_ROLE }}