@@ -298,9 +298,9 @@ jobs:
298298 if : env.BUILD_DOCKER_IMAGE == 'true'
299299 uses : azure/docker-login@v2
300300 with :
301- login-server : ${{ secrets.ACR_DEV_LOGIN_SERVER }}
302- username : ${{ secrets.ACR_DEV_USERNAME }}
303- password : ${{ secrets.ACR_DEV_PASSWORD }}
301+ login-server : ${{ secrets.ACR_TEST_LOGIN_SERVER }}
302+ username : ${{ secrets.ACR_TEST_USERNAME }}
303+ password : ${{ secrets.ACR_TEST_PASSWORD }}
304304
305305 - name : Build and Push Docker Image
306306 if : env.BUILD_DOCKER_IMAGE == 'true'
@@ -311,8 +311,8 @@ jobs:
311311 file : ./src/WebApp.Dockerfile
312312 push : true
313313 tags : |
314- ${{ secrets.ACR_DEV_LOGIN_SERVER }}/webapp:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
315- ${{ secrets.ACR_DEV_LOGIN_SERVER }}/webapp:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
314+ ${{ secrets.ACR_TEST_LOGIN_SERVER }}/webapp:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}
315+ ${{ secrets.ACR_TEST_LOGIN_SERVER }}/webapp:${{ steps.generate_docker_tag.outputs.IMAGE_TAG }}_${{ github.run_number }}
316316
317317 - name : Verify Docker Image Build
318318 if : env.BUILD_DOCKER_IMAGE == 'true'
@@ -357,8 +357,8 @@ jobs:
357357 run : |
358358 echo "=== Docker Image Information ==="
359359 echo "Docker Image Tag: ${{ env.IMAGE_TAG }}"
360- echo "Registry: ${{ secrets.ACR_DEV_LOGIN_SERVER }}"
361- echo "Full Image: ${{ secrets.ACR_DEV_LOGIN_SERVER }}/webapp:${{ env.IMAGE_TAG }}"
360+ echo "Registry: ${{ secrets.ACR_TEST_LOGIN_SERVER }}"
361+ echo "Full Image: ${{ secrets.ACR_TEST_LOGIN_SERVER }}/webapp:${{ env.IMAGE_TAG }}"
362362 echo "================================"
363363
364364 - name : Deploy using azd up and extract values (${{ env.WAF_ENABLED == 'true' && 'WAF' || 'Non-WAF' }}+${{ env.EXP == 'true' && 'EXP' || 'Non-EXP' }})
@@ -393,7 +393,7 @@ jobs:
393393 # Set ACR name only when building Docker image
394394 if [[ "${{ env.BUILD_DOCKER_IMAGE }}" == "true" ]]; then
395395 # Extract ACR name from login server and set as environment variable
396- ACR_NAME=$(echo "${{ secrets.ACR_DEV_LOGIN_SERVER }}" | cut -d'.' -f1)
396+ ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}" | cut -d'.' -f1)
397397 azd env set AZURE_ENV_ACR_NAME="$ACR_NAME"
398398 echo "Set ACR name to: $ACR_NAME"
399399 else
@@ -557,13 +557,13 @@ jobs:
557557 echo "Deleting Docker images with tag: ${{ env.IMAGE_TAG }}"
558558
559559 # Delete the main image
560- echo "Deleting image: ${{ secrets.ACR_DEV_LOGIN_SERVER }}/webapp:${{ env.IMAGE_TAG }}"
561- az acr repository delete --name $(echo "${{ secrets.ACR_DEV_LOGIN_SERVER }}" | cut -d'.' -f1) \
560+ echo "Deleting image: ${{ secrets.ACR_TEST_LOGIN_SERVER }}/webapp:${{ env.IMAGE_TAG }}"
561+ az acr repository delete --name $(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}" | cut -d'.' -f1) \
562562 --image webapp:${{ env.IMAGE_TAG }} --yes || echo "Warning: Failed to delete main image or image not found"
563563
564564 # Delete the image with run number suffix
565- echo "Deleting image: ${{ secrets.ACR_DEV_LOGIN_SERVER }}/webapp:${{ env.IMAGE_TAG }}_${{ github.run_number }}"
566- az acr repository delete --name $(echo "${{ secrets.ACR_DEV_LOGIN_SERVER }}" | cut -d'.' -f1) \
565+ echo "Deleting image: ${{ secrets.ACR_TEST_LOGIN_SERVER }}/webapp:${{ env.IMAGE_TAG }}_${{ github.run_number }}"
566+ az acr repository delete --name $(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}" | cut -d'.' -f1) \
567567 --image webapp:${{ env.IMAGE_TAG }}_${{ github.run_number }} --yes || echo "Warning: Failed to delete run-numbered image or image not found"
568568
569569 echo "✅ Docker images cleanup completed"
0 commit comments