CI: use registry fallback and avoid hard ACR_LOGIN_SERVER failure; use chosen registry in build/push/deploy

Author: mbertelsen

.github/workflows/docker-deploy.yml

@@ -7,31 +7,37 @@ on:
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
+    env:
+      REGISTRY: tpsappscriptingacr.azurecr.io
     steps:
       - uses: actions/checkout@v4
 
       - name: Assert required ACR secrets are set
         run: |
-          if [ -z "${{ secrets.ACR_LOGIN_SERVER }}" ]; then echo "ERROR: secrets.ACR_LOGIN_SERVER is not set"; exit 1; fi
           if [ -z "${{ secrets.ACR_USERNAME }}" ]; then echo "ERROR: secrets.ACR_USERNAME is not set"; exit 1; fi
           if [ -z "${{ secrets.ACR_PASSWORD }}" ]; then echo "ERROR: secrets.ACR_PASSWORD is not set"; exit 1; fi
 
+      - name: Determine registry to use
+        id: registry
+        run: |
+          if [ -n "${{ secrets.ACR_LOGIN_SERVER }}" ]; then echo "registry=${{ secrets.ACR_LOGIN_SERVER }}" >> $GITHUB_OUTPUT; else echo "registry=${{ env.REGISTRY }}" >> $GITHUB_OUTPUT; fi
+
       - name: Log in to Azure Container Registry
         uses: azure/docker-login@v1
         with:
-          login-server: ${{ secrets.ACR_LOGIN_SERVER }}
+          login-server: ${{ steps.registry.outputs.registry }}
           username: ${{ secrets.ACR_USERNAME }}
           password: ${{ secrets.ACR_PASSWORD }}
 
       - name: Build and push editor image
         run: |
-          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor:latest .
-          docker push ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor:latest
+          docker build -t ${{ steps.registry.outputs.registry }}/app-scripting-editor:latest .
+          docker push ${{ steps.registry.outputs.registry }}/app-scripting-editor:latest
 
       - name: Build and push editor-api image
         run: |
-          docker build -t ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor-api:latest ./server/server
-          docker push ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor-api:latest
+          docker build -t ${{ steps.registry.outputs.registry }}/app-scripting-editor-api:latest ./server/server
+          docker push ${{ steps.registry.outputs.registry }}/app-scripting-editor-api:latest
 
   deploy-to-appservice:
     needs: build-and-push
@@ -44,8 +50,8 @@ jobs:
 
       - name: Deploy editor to App Service (container)
         run: |
-          az webapp config container set --name ${{ secrets.EDITOR_APP_NAME }} --resource-group ${{ secrets.RESOURCE_GROUP }} --docker-custom-image-name ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor:latest
+          az webapp config container set --name ${{ secrets.EDITOR_APP_NAME }} --resource-group ${{ secrets.RESOURCE_GROUP }} --docker-custom-image-name ${{ steps.registry.outputs.registry }}/app-scripting-editor:latest
 
       - name: Deploy editor-api to App Service (container)
         run: |
-          az webapp config container set --name ${{ secrets.EDITOR_API_APP_NAME }} --resource-group ${{ secrets.RESOURCE_GROUP }} --docker-custom-image-name ${{ secrets.ACR_LOGIN_SERVER }}/app-scripting-editor-api:latest
+          az webapp config container set --name ${{ secrets.EDITOR_API_APP_NAME }} --resource-group ${{ secrets.RESOURCE_GROUP }} --docker-custom-image-name ${{ steps.registry.outputs.registry }}/app-scripting-editor-api:latest