Update Sandbox.yml

Author: nabad600

.github/workflows/Sandbox.yml

@@ -1,11 +1,10 @@
 name: QA-Prod
 
 on:
-  workflow_dispatch: # used for QA Deployments
+  workflow_dispatch:
   push:
     tags:
       - 'sandbox-[0-9]+.[0-9]+.[0-9]+'
-      # - '[0-9]+.[0-9]+.[0-9]+'
 
 jobs:
   build:
@@ -17,33 +16,38 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set Docker Tag
+    - name: Set Docker Variables
       id: vars
       run: |
-        REPOSITORY1="sandbox-${GITHUB_REPOSITORY#*/}"
-        RAW_TAG="${GITHUB_REF#refs/tags/}"                         
-        REPOSITORY="${RAW_TAG%%:*}"                                
-        FULL_TAG="${RAW_TAG#*:}"                                   
-        CLEAN_TAG="${FULL_TAG#sandbox-}"                           
-
-        # echo "REPOSITORY1=$REPOSITORY1"
-        # echo "CLEAN_TAG=$CLEAN_TAG"
-
-        echo "REPOSITORY1=$REPOSITORY1" >> $GITHUB_ENV
-        echo "TAG=$CLEAN_TAG" >> $GITHUB_ENV
-        echo "TARGET=${{ secrets.SLACK_WEBHOOK_PROD }}" >> $GITHUB_ENV
-
-        echo "::set-output name=REPOSITORY1::$REPOSITORY1"
-        echo "::set-output name=TAG::$CLEAN_TAG"
-        echo "::set-output name=TARGET::${{ secrets.SLACK_WEBHOOK_PROD }}"
+        REPOSITORY="sandbox-${GITHUB_REPOSITORY#*/}"
+        echo "REPOSITORY=$REPOSITORY" >> $GITHUB_OUTPUT
+
+        if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+          RAW_TAG="${GITHUB_REF#refs/tags/}"         # e.g., sandbox-adminer-core:sandbox-1.1.3
+          REPO_NAME="${RAW_TAG%%:*}"                 # e.g., sandbox-adminer-core
+          VERSION_WITH_SANDBOX="${RAW_TAG#*:}"       # e.g., sandbox-1.1.3
+          VERSION="${VERSION_WITH_SANDBOX#sandbox-}" # e.g., 1.1.3
+          
+          FINAL_TAG="${REPO_NAME}:${VERSION}"        # e.g., sandbox-adminer-core:1.1.3
+
+          echo "TAG=$VERSION" >> $GITHUB_OUTPUT
+          echo "DOCKER_TAG=$FINAL_TAG" >> $GITHUB_OUTPUT
+          echo "TARGET=${{ secrets.SLACK_WEBHOOK_PROD }}" >> $GITHUB_OUTPUT
+        else
+          TAG="qa-${GITHUB_SHA::7}-$(date +%s)"
+          FINAL_TAG="${REPOSITORY}:${TAG}"
+
+          echo "TAG=$TAG" >> $GITHUB_OUTPUT
+          echo "DOCKER_TAG=$FINAL_TAG" >> $GITHUB_OUTPUT
+          echo "TARGET=${{ secrets.SLACK_WEBHOOK }}" >> $GITHUB_OUTPUT
+        fi
 
     - name: Build and Push Docker Image
       env:
         LLC_ECR_HOST: ${{ secrets.LLC_ECR_HOST }}
-        REPOSITORY: ${{ steps.vars.outputs.REPOSITORY1 }}
-        TAG: ${{ env.TAG }}
+        DOCKER_TAG: ${{ steps.vars.outputs.DOCKER_TAG }}
       run: |
-        IMAGE=${LLC_ECR_HOST}/${REPOSITORY}:${TAG}
-        echo "Building Docker image: $IMAGE"
+        IMAGE="${LLC_ECR_HOST}/${DOCKER_TAG}"
+        echo "Building image: $IMAGE"
         docker build . --file Dockerfile --tag "$IMAGE"
         docker push "$IMAGE"