Refactor deployment workflow to dynamically set image tags and full image names based on the current branch and commit SHA. This improves versioning clarity and enhances the overall deployment process.

Author: codesark

.github/workflows/build-push-deploy.yml

@@ -93,14 +93,24 @@ jobs:
     runs-on: ubuntu-latest
     needs: build-and-push
     if: github.ref == 'refs/heads/main' && needs.build-and-push.result == 'success'
-    env:
-      FULL_IMAGE: ${{ needs.build-and-push.outputs.full_image }}
-      IMAGE_TAG: ${{ needs.build-and-push.outputs.image_tag }}
-      SHA_SHORT: ${{ needs.build-and-push.outputs.sha_short }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Set deployment image tag
+        id: image
+        run: |
+          BRANCH="${GITHUB_REF#refs/heads/}"
+          SHA_SHORT="$(git rev-parse --short HEAD)"
+          IMAGE_TAG="${BRANCH}-${SHA_SHORT}"
+          FULL_IMAGE="${{ env.DOCKER_IMAGE }}:${IMAGE_TAG}"
+          echo "full_image=${FULL_IMAGE}" >> "$GITHUB_OUTPUT"
+          echo "image_tag=${IMAGE_TAG}" >> "$GITHUB_OUTPUT"
+          echo "sha_short=${SHA_SHORT}" >> "$GITHUB_OUTPUT"
+          echo "FULL_IMAGE=${FULL_IMAGE}" >> "$GITHUB_ENV"
+          echo "IMAGE_TAG=${IMAGE_TAG}" >> "$GITHUB_ENV"
+          echo "SHA_SHORT=${SHA_SHORT}" >> "$GITHUB_ENV"
+
       - name: Setup SSH
         uses: webfactory/ssh-agent@v0.9.0
         with: