CI: robust registry selection and ensure package-lock.json before build; fix build-push inputs

Author: mbertelsen

.github/workflows/docker-build.yml

@@ -28,37 +28,44 @@ jobs:
         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: |
+        # Prefer explicit secret ACR_LOGIN_SERVER when present, otherwise use env.REGISTRY
+        if [ -n "${{ secrets.ACR_LOGIN_SERVER }}" ]; then
+          echo "registry=${{ secrets.ACR_LOGIN_SERVER }}" >> $GITHUB_OUTPUT
+        else
+          echo "registry=${{ env.REGISTRY }}" >> $GITHUB_OUTPUT
+        fi
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Log in to Azure Container Registry
       uses: docker/login-action@v3
       with:
-        registry: ${{ env.REGISTRY }}
+        registry: ${{ steps.registry.outputs.registry }}
         username: ${{ secrets.ACR_USERNAME }}
         password: ${{ secrets.ACR_PASSWORD }}
 
     - name: Extract metadata
       id: meta
       uses: docker/metadata-action@v5
       with:
-        images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        images: ${{ steps.registry.outputs.registry }}/${{ env.IMAGE_NAME }}
         tags: |
           type=ref,event=branch
           type=ref,event=pr
           type=sha,prefix={{branch}}-
           type=raw,value=latest,enable={{is_default_branch}}
 
-    - name: Build and push Docker image
-      uses: docker/build-push-action@v5
-      # Ensure package-lock.json exists to avoid BuildKit checksum errors when restoring cache
-      # (some previous caches may reference package-lock.json; creating a harmless file prevents failures)
-      env:
-        GITHUB_WORKSPACE: ${{ github.workspace }}
     - name: Ensure package-lock.json exists
       run: |
         if [ ! -f package-lock.json ]; then echo '{}' > package-lock.json; fi
 
+    - name: Build and push Docker image
+      id: build
+      uses: docker/build-push-action@v5
       with:
         context: .
         file: ./Dockerfile