fix: rollback the CI change and debug the commit hash issue

Author: MacMur85

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

@@ -29,35 +29,6 @@ on:
         required: true
         type: string
 
-  workflow_dispatch: # Added for manual triggers
-    inputs:
-      environment_tag:
-        description: Environment of the deployment
-        required: true
-        type: string
-        default: development
-      docker_compose_file:
-        description: The path of the compose.yaml file needed to build docker images
-        required: true
-        type: string
-      function_app_source_code_path:
-        description: The source path of the function app source code for the docker builds
-        required: true
-        type: string
-      project_name:
-        description: The name of the project
-        required: true
-        type: string
-      excluded_containers_csv_list:
-        description: Excluded containers in a comma separated list
-        required: true
-        type: string
-      build_all_containers: # New input for manual "build all"
-        description: Manual build for ALL containers defined in compose files
-        required: false
-        type: boolean
-        default: false
-
 jobs:
   get-functions:
     runs-on: ubuntu-latest
@@ -84,13 +55,9 @@ jobs:
       - name: Determine which Docker container(s) to build
         id: get-function-names
         env:
-          # Conditionally source inputs based on trigger type
-          COMPOSE_FILES_CSV: ${{ (github.event_name == 'workflow_call' && inputs.docker_compose_file) || github.event.inputs.docker_compose_file }}
-          EXCLUDED_CONTAINERS_CSV: ${{ (github.event_name == 'workflow_call' && inputs.excluded_containers_csv_list) || github.event.inputs.excluded_containers_csv_list }}
-          SOURCE_CODE_PATH: ${{ (github.event_name == 'workflow_call' && inputs.function_app_source_code_path) || github.event.inputs.function_app_source_code_path }}
-          # Pass manual flag to script; defaults to 'false' if not a workflow_dispatch or if input not set
-          BUILD_ALL_CONTAINERS: ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.build_all_containers) || 'false' }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COMPOSE_FILES_CSV: ${{ inputs.docker_compose_file }}
+          EXCLUDED_CONTAINERS_CSV: ${{ inputs.excluded_containers_csv_list }}
+          SOURCE_CODE_PATH: ${{ inputs.function_app_source_code_path }}
         run: bash ./templates/scripts/deployments/get-docker-names.sh
 
   build-and-push:
@@ -136,8 +103,7 @@ jobs:
       - name: Create Tags
         env:
           GH_TOKEN: ${{ github.token }}
-          # Conditionally source environment_tag
-          ENVIRONMENT_TAG: ${{ (github.event_name == 'workflow_call' && inputs.environment_tag) || github.event.inputs.environment_tag }}
+          ENVIRONMENT_TAG: ${{ inputs.environment_tag }}
         continue-on-error: false
         run: |
           echo "The branch is: ${GITHUB_REF}"
@@ -164,9 +130,8 @@ jobs:
         working-directory: ${{ steps.get-function-names.outputs.DOCKER_COMPOSE_DIR }}
         continue-on-error: false
         env:
-          # Conditionally source inputs
-          COMPOSE_FILE: ${{ (github.event_name == 'workflow_call' && inputs.docker_compose_file) || github.event.inputs.docker_compose_file }}
-          PROJECT_NAME: ${{ (github.event_name == 'workflow_call' && inputs.project_name) || github.event.inputs.project_name }}
+          COMPOSE_FILE: ${{ inputs.docker_compose_file }}
+          PROJECT_NAME: ${{ inputs.project_name }}
         run: |
           function=${{ matrix.function }}
           echo PROJECT_NAME: ${PROJECT_NAME}
@@ -310,8 +275,7 @@ jobs:
         env:
           ACR_NAME: ${{ secrets.ACR_NAME }}
           SHORT_COMMIT_HASH: ${{ needs.build-and-push.outputs.short_commit_hash }}
-          # Conditionally source environment_tag
-          ENVIRONMENT_TAG: ${{ (github.event_name == 'workflow_call' && inputs.environment_tag) || github.event.inputs.environment_tag }}
+          ENVIRONMENT_TAG: ${{ inputs.environment_tag }}
         run: bash ./templates/scripts/deployments/append-commit-hash.sh
 
   aggregate-json:

scripts/deployments/get-docker-names.sh

@@ -1,6 +1,13 @@
 #!/bin/bash
 
-set -eo pipefail
+# Exit immediately if a command exits with a non-zero status.
+set -e
+# Treat unset variables as an error when substituting.
+set -u
+# Pipestatus: if any command in a pipeline fails, the return status is that of the failed command.
+set -o pipefail
+# Print each command to stderr before executing.
+set -x
 
 remove_from_array() {
     local item_to_remove="$1"
@@ -41,12 +48,6 @@ echo -e "\nChanged source code folder(s):"
 printf "  - %s\n" "${source_changes[@]}"
 echo
 
-# If BUILD_ALL_CONTAINERS is true
-if [[ "${BUILD_ALL_CONTAINERS,,}" == "true" ]]; then
-    echo "BUILD_ALL_CONTAINERS is true. Change detection based on specific folders will be skipped; all services will be included."
-    source_changes=()
-fi
-
 [[ -n "${EXCLUDED_CONTAINERS_CSV}" ]] && EXCLUSION_FILTER="select($(echo "${EXCLUDED_CONTAINERS_CSV}" | awk -v ORS='' '{split($0, arr, ","); for (i in arr) printf ".container_name != \"%s\" and ", arr[i]} END {print "1"}')) |"
 
 IFS_OLD=$IFS
@@ -104,12 +105,7 @@ for compose_file in ${COMPOSE_FILES_CSV}; do
     echo
 
     # STEP 2 - Now check the source code changes against the map created in STEP 1 to determine which containers to build
-    if [[ "${BUILD_ALL_CONTAINERS,,}" == "true" ]]; then
-        echo "BUILD_ALL_CONTAINERS: Adding all services from '${compose_file}'."
-        for key in "${!docker_services_map[@]}"; do
-            changed_services+=("${docker_services_map[$key]}")
-        done
-    elif [[ ${#source_changes[@]} -eq 0 ]]; then
+    if [[ ${#source_changes[@]} -eq 0 ]]; then
         echo "No files changed."
 
     elif [[ "${source_changes[*],,}" =~ shared ]]; then