Outputs on containers-to-build

Remove duplicate fetch tag metadata
Build Docker Images has an id for repository_path
Set output for docker_compose_dir

Author: micjustus-nc

.github/workflows/stage-3-build.yaml

@@ -45,6 +45,9 @@ jobs:
       id-token: write
     outputs:
       containers: ${{ steps.get-function-names.outputs.FUNC_NAMES }}
+      pr_num_tag: ${{ steps.tags.outputs.pr_num_tag }}
+      short_commit_hash: ${{ steps.tags.outputs.short_commit_hash }}
+      docker_compose_dir: ${{ steps.get-function-names.outputs.DOCKER_COMPOSE_DIR }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -104,9 +107,6 @@ jobs:
       fail-fast: false
       matrix:
         function: ${{ fromJSON(needs.containers-to-build.outputs.containers) }}
-    outputs:
-      pr_num_tag: ${{ steps.tags.outputs.pr_num_tag }}
-      short_commit_hash: ${{ steps.tags.outputs.short_commit_hash }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -120,35 +120,20 @@ jobs:
           path: templates
           ref: fix/function-app-acr-is-optional
 
-      - name: Fetch tag metadata
-        id: tags
-        env:
-          GH_TOKEN: ${{ github.token }}
-          REGISTRY: ${{ env.USE_AZURECR == 'true' && format('{0}.azurecr.io', secrets.ACR_NAME) || format('ghcr.io/{0}', github.repository_owner) }}
-        run: |
-          set -x
-          if [[ "${GITHUB_REF}" == refs/pull/*/merge ]]; then
-            pr_number=$(echo "${GITHUB_REF}" | sed 's/refs\/pull\/\([0-9]*\)\/merge/\1/')
-          else
-            pr_number=$(gh api repos/{owner}/{repo}/commits/${GITHUB_SHA}/pulls --jq 'sort_by(.updated_at) | reverse | .[0].number')
-          fi
-          {
-            echo "pr_num_tag=pr${pr_number}"
-            echo "short_commit_hash=$(git rev-parse --short ${GITHUB_SHA})"
-            echo "registry_repository_path=${REGISTRY,,}/${PROJECT_NAME,,}-${{ matrix.function }}"
-          } >> "${GITHUB_OUTPUT}"
-
       - name: Build Docker image
-        working-directory: ${{ steps.get-function-names.outputs.DOCKER_COMPOSE_DIR }}
+        id: docker_image
+        working-directory: ${{ needs.containers-to-build.outputs.docker_compose_dir }}
         continue-on-error: false
         env:
           IMAGE_NAME: ${{ inputs.project_name }}-${{ matrix.function }}
-          PR_NUM_TAG: ${{ steps.tags.outputs.pr_num_tag }}
-          REPO_PATH: ${{ steps.tags.outputs.registry_repository_path }}
+          PR_NUM_TAG: ${{ needs.containers-to-build.outputs.pr_num_tag }}
+          REGISTRY: ${{ env.USE_AZURECR == 'true' && format('{0}.azurecr.io', secrets.ACR_NAME) || format('ghcr.io/{0}', github.repository_owner) }}
         run: |
+          echo "repository_path=${REGISTRY,,}/${IMAGE_NAME}" >> "${GITHUB_OUTPUT}"
+
           docker compose -f ${COMPOSE_FILE//,/ -f } -p ${PROJECT_NAME} build --no-cache --pull ${{ matrix.function }}
           docker tag ${IMAGE_NAME}:latest "${REPO_PATH}:${PR_NUM_TAG}"
-          [[ -n "${ENVIRONMENT_TAG}" ]] && docker tag "${IMAGE_NAME}:latest "${REPO_PATH}:${ENVIRONMENT_TAG}"
+          [[ -n "${ENVIRONMENT_TAG}" ]] && docker tag "${IMAGE_NAME}:latest "$${ENVIRONMENT_TAG}"
 
       - name: AzureCLI login
         if: github.ref == 'refs/heads/main' && env.USE_AZURECR == 'true'
@@ -168,11 +153,11 @@ jobs:
 
       - name: Push Docker image
         if: github.ref == 'refs/heads/main' || env.IS_TEST_DEPLOY == 'true'
-        working-directory: ${{ steps.get-function-names.outputs.DOCKER_COMPOSE_DIR }}
+        working-directory: ${{ needs.containers-to-build.outputs.docker_compose_dir }}
         continue-on-error: false
         env:
-          PR_NUM_TAG: ${{ steps.tags.outputs.pr_num_tag }}
-          REPO_PATH: ${{ steps.tags.outputs.registry_repository_path }}
+          PR_NUM_TAG: ${{ needs.containers-to-build.outputs.pr_num_tag }}
+          REPO_PATH: ${{ steps.docker_image.outputs.repository_path }}
         run: |
           [[ "${USE_AZURECR}" == "true" ]] && az acr login --name "${ACR_NAME}"
           [[ -n "${ENVIRONMENT_TAG}" ]] && docker push "${REPO_PATH}:${ENVIRONMENT_TAG}"
@@ -194,10 +179,10 @@ jobs:
     name: Add merge commit tag to all images
     if: github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
-    needs: build-and-push
+    needs: [build-and-push, containers-to-build]
     env:
-      PR_NUM_TAG: ${{ needs.build-and-push.outputs.pr_num_tag }}
-      SHORT_COMMIT_HASH: ${{ needs.build-and-push.outputs.short_commit_hash }}
+      PR_NUM_TAG: ${{ needs.containers-to-build.outputs.pr_num_tag }}
+      SHORT_COMMIT_HASH: ${{ needs.containers-to-build.outputs.short_commit_hash }}
     permissions:
       id-token: write
       packages: write
@@ -271,10 +256,10 @@ jobs:
       - name: Get all artifacts
         uses: actions/download-artifact@v4
         with:
-          path: reports-${{ needs.build-and-push.outputs.pr_num_tag }}
+          path: reports-${{ needs.containers-to-build.outputs.pr_num_tag }}
 
       - name: Aggregate reports
         uses: actions/upload-artifact@v4
         with:
-          name: aggregated-reports-${{ needs.build-and-push.outputs.pr_num_tag }}
-          path: reports-${{ needs.build-and-push.outputs.pr_num_tag }}
+          name: aggregated-reports-${{ needs.containers-to-build.outputs.pr_num_tag }}
+          path: reports-${{ needs.containers-to-build.outputs.pr_num_tag }}