fix: downmerge from main to dev

.github/CODEOWNERS

@@ -2,4 +2,4 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in the repo.
-* @Avijit-Microsoft @Roopan-Microsoft @Prajwal1-Microsoft @VinaySh-Microsoft @aniaroramsft @Dongbumlee @sethsteenken @toherman-msft @nchandhi @dgp10801
+* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @Vinay-Microsoft @aniaroramsft @Dongbumlee @sethsteenken @toherman-msft @nchandhi @dgp10801

azure.yaml

@@ -12,8 +12,8 @@ hooks:
     posix:
       shell: sh
       run: |  
-        echo "==> Building and pushing container images to the dedicated ACR (remote build)"
-        bash ./scripts/deploy_container_images.sh
+        echo "ℹ️  Container images are NOT built automatically. Run the build manually when ready:"
+        echo "    bash ./scripts/acr_build_push.sh"
         echo "-----"
         echo "🧭 Web App Details:"
         echo "✅ Name: $CONTAINER_WEB_APP_NAME"
@@ -29,8 +29,8 @@ hooks:
     windows:
       shell: pwsh
       run: |  
-        Write-Host "==> Building and pushing container images to the dedicated ACR (remote build)"
-        ./scripts/deploy_container_images.ps1
+        Write-Host "ℹ️  Container images are NOT built automatically. Run the build manually when ready:"
+        Write-Host "    ./scripts/acr_build_push.ps1"
         Write-Host "-----"
         Write-Host "🧭 Web App Details:"
         Write-Host "✅ Name: $env:CONTAINER_WEB_APP_NAME"

docs/DeploymentGuide.md

@@ -294,7 +294,21 @@ azd up
 
 **⚠️ Deployment Issues:** If you encounter errors or timeouts, try a different region as there may be capacity constraints. For detailed error solutions, see our [Troubleshooting Guide](./TroubleShootingSteps.md).
 
-### 4.3 Get Application URL
+### 4.3 Run the script to build and push the application images
+
+Build and push the frontend, backend, and processor images to the dedicated ACR, then update the Container Apps to use them. This step is **not run automatically** by `azd up` — run it from the repository root after deployment:
+
+```powershell
+# PowerShell
+./scripts/acr_build_push.ps1
+```
+
+```bash
+# Bash
+bash ./scripts/acr_build_push.sh
+```
+
+### 4.4 Get Application URL
 
 After successful deployment:
 1. Open [Azure Portal](https://portal.azure.com/)
@@ -315,7 +329,7 @@ After successful deployment:
 
 ### 5.2 Verify Deployment
 
-1. Access your application using the URL from Step 4.3
+1. Access your application using the URL from Step 4.4
 2. Confirm the application loads successfully
 3. Verify you can sign in with your authenticated account
 

infra/main.bicep

@@ -45,12 +45,12 @@ param azureAiServiceLocation string
 #disable-next-line no-unused-params
 param containerRegistryEndpoint string = ''
 
-@description('Optional. The image tag to use for container images. Defaults to "latest_v2".')
-param imageTag string = 'latest_v2'
+@description('Optional. The image tag to use for container images. Defaults to "latest".')
+param imageTag string = 'latest'
 
 @description('''Optional. Placeholder container image used to initially provision the container apps.
-The dedicated Azure Container Registry is empty right after infrastructure provisioning, so a public image is used as the default allowed image until the post-deployment script (scripts/deploy_container_images.*) builds and pushes the deployment-specific images and updates the apps. Defaults to the Azure Container Apps quickstart image.''')
-param placeholderContainerImage string = 'mcr.microsoft.com/k8se/quickstart:latest'
+The dedicated Azure Container Registry is empty right after infrastructure provisioning, so a public image is used as the default allowed image until the post-deployment script (scripts/acr_build_push.*) builds and pushes the deployment-specific images and updates the apps. Defaults to the Azure Container Apps hello-world image.''')
+param placeholderContainerImage string = 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
 
 @minLength(1)
 @allowed(['Standard', 'GlobalStandard'])
@@ -236,13 +236,19 @@ module containerRegistry './modules/containerRegistry.bicep' = {
     name: containerRegistryName
     location: solutionLocation
     tags: allTags
-    // Premium SKU in WAF/private-networking mode (supports higher throughput and
-    // future private endpoints). Public network access is kept Enabled in both
-    // modes so remote `az acr build` (ACR Tasks) and managed-identity pulls work;
-    // AzureServices bypass lets trusted ACR Tasks reach the registry.
+    // Premium SKU in WAF/private-networking mode (required for private endpoints
+    // and network rule sets). In WAF mode public network access is Disabled at
+    // rest; runtime pulls flow over a private endpoint and the post-deploy build
+    // script temporarily re-enables public access for the remote `az acr build`.
     sku: enablePrivateNetworking ? 'Premium' : 'Standard'
-    publicNetworkAccess: 'Enabled'
+    publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'
     networkRuleBypassOptions: 'AzureServices'
+    // WAF: host the registry private endpoint in the backend subnet and link it
+    // to the privatelink.azurecr.io DNS zone so image pulls resolve privately.
+    // Reference the VNet and DNS zone outputs directly to avoid case-sensitivity
+    // issues with manually constructed resource IDs.
+    privateEndpointSubnetResourceId: enablePrivateNetworking ? virtualNetwork!.outputs.backendSubnetResourceId : ''
+    privateDnsZoneResourceId: enablePrivateNetworking ? avmPrivateDnsZones[dnsZoneIndex.containerRegistry]!.outputs.resourceId : ''
     // Application managed identity gets AcrPull for identity-based image pulls.
     acrPullPrincipalIds: [
       appIdentity.outputs.principalId
@@ -605,6 +611,7 @@ var privateDnsZones = [
   'privatelink.blob.${environment().suffixes.storage}'
   'privatelink.queue.${environment().suffixes.storage}'
   'privatelink.azconfig.io'
+  'privatelink.azurecr.io'
 ]
 
 // DNS Zone Index Constants
@@ -616,6 +623,7 @@ var dnsZoneIndex = {
   storageBlob: 4
   storageQueue: 5
   appConfig: 6
+  containerRegistry: 7
 }
 
 // List of DNS zone indices that correspond to AI-related services.