Merge pull request #653 from microsoft/main

chore: Main to Dev downMerge

Author: Avijit-Microsoft

.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 @Prajwal-Microsoft @Vinay-Microsoft @aniaroramsft @toherman-msft @nchandhi @dgp10801
+* @Avijit-Microsoft @Roopan-Microsoft @Prajwal1-Microsoft @VinaySh-Microsoft @aniaroramsft @toherman-msft @nchandhi @dgp10801

azure.yaml

@@ -11,12 +11,5 @@ metadata:
   name: content-processinge@1.0
 
 hooks:
-  postprovision:
-    posix:
-      shell: sh
-      run: sed -i 's/\r$//' ./infra/scripts/post_deployment.sh; bash ./infra/scripts/post_deployment.sh
-      interactive: true
-    windows:
-      shell: pwsh
-      run: ./infra/scripts/post_deployment.ps1
-      interactive: true
+  postprovision: {}
+  

docs/DeploymentGuide.md

@@ -301,7 +301,37 @@ azd up
 
 ## Step 5: Post-Deployment Configuration
 
-### 5.1 Schema Registration (Automatic)
+### 5.1 Run Post Deployment Scripts
+
+1. Run the ACR build and push script from the project root. Use the appropriate command for your shell:
+
+   - For Bash (Linux/macOS/WSL):
+
+     ```bash
+     bash infra/scripts/acr_build_push.sh
+     ```
+
+   - For PowerShell (Windows):
+
+     ```powershell
+     infra\scripts\acr_build_push.ps1
+     ```
+
+2. After the ACR build and push completes, run the post-deployment script:
+
+   - For Bash (Linux/macOS/WSL):
+
+     ```bash
+     bash infra/scripts/post_deployment.sh
+     ```
+
+   - For PowerShell (Windows):
+
+     ```powershell
+     .\infra\scripts\post_deployment.ps1
+     ```
+
+### 5.2 Schema Registration (Automatic)
 
  > Want to customize the schemas for your own documents? [Learn more about adding your own schemas here.](./CustomizeSchemaData.md)
 

infra/main.bicep

@@ -72,12 +72,6 @@ param gptModelVersion string = '2025-11-13'
 @description('Optional. Capacity of the GPT deployment: (minimum 10).')
 param gptDeploymentCapacity int = 300
 
-@description('Optional. The container registry login server/endpoint for the container images (for example, an Azure Container Registry endpoint).')
-param containerRegistryEndpoint string = 'cpscontainerreg.azurecr.io'
-
-@description('Optional. The image tag for the container images.')
-param imageTag string = 'latest_v2'
-
 @description('Optional. Enable WAF for the deployment.')
 param enablePrivateNetworking bool = false
 
@@ -722,11 +716,6 @@ module avmAiServices 'modules/account/aifoundry.bicep' = {
     customSubDomainName: 'aif-${solutionSuffix}'
     diagnosticSettings: enableMonitoring ? [{ workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId }] : null
     roleAssignments: [
-      {
-        principalId: avmManagedIdentity.outputs.principalId
-        roleDefinitionIdOrName: '8e3af657-a8ff-443c-a75c-2fe8c4bcb635' // Owner role
-        principalType: 'ServicePrincipal'
-      }
       {
         principalId: avmContainerApp.outputs.systemAssignedMIPrincipalId!
         roleDefinitionIdOrName: 'Cognitive Services OpenAI User'
@@ -888,19 +877,24 @@ module avmContainerApp 'br/public:avm/res/app/container-app:0.22.1' = {
     environmentResourceId: avmContainerAppEnv.outputs.resourceId
     workloadProfileName: 'Consumption'
     enableTelemetry: enableTelemetry
-    registries: null
+    registries: [
+      {
+        server: avmContainerRegistry.outputs.loginServer
+        identity: avmContainerRegistryReader.outputs.resourceId
+      }
+    ]
     managedIdentities: {
       systemAssigned: true
       userAssignedResourceIds: [
         avmContainerRegistryReader.outputs.resourceId
       ]
     }
-
+ 
     containers: [
       {
         name: 'ca-${solutionSuffix}'
-        image: '${containerRegistryEndpoint}/contentprocessor:${imageTag}'
-
+        image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
+ 
         resources: {
           cpu: 4
           memory: '8.0Gi'
@@ -957,7 +951,12 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.22.1' = {
     environmentResourceId: avmContainerAppEnv.outputs.resourceId
     workloadProfileName: 'Consumption'
     enableTelemetry: enableTelemetry
-    registries: null
+    registries: [
+      {
+        server: avmContainerRegistry.outputs.loginServer
+        identity: avmContainerRegistryReader.outputs.resourceId
+      }
+    ]
     tags: tags
     managedIdentities: {
       systemAssigned: true
@@ -968,7 +967,7 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.22.1' = {
     containers: [
       {
         name: 'ca-${solutionSuffix}-api'
-        image: '${containerRegistryEndpoint}/contentprocessorapi:${imageTag}'
+        image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
         resources: {
           cpu: 4
           memory: '8.0Gi'
@@ -1079,7 +1078,7 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.22.1' = {
     }
   }
 }
-
+ 
 //========== Container App Web ========== //
 module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.22.1' = {
   name: take('avm.res.app.container-app-web.${solutionSuffix}', 64)
@@ -1089,7 +1088,12 @@ module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.22.1' = {
     environmentResourceId: avmContainerAppEnv.outputs.resourceId
     workloadProfileName: 'Consumption'
     enableTelemetry: enableTelemetry
-    registries: null
+    registries: [
+      {
+        server: avmContainerRegistry.outputs.loginServer
+        identity: avmContainerRegistryReader.outputs.resourceId
+      }
+    ]
     tags: tags
     managedIdentities: {
       systemAssigned: true
@@ -1119,7 +1123,7 @@ module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.22.1' = {
     containers: [
       {
         name: 'ca-${solutionSuffix}-web'
-        image: '${containerRegistryEndpoint}/contentprocessorweb:${imageTag}'
+        image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
         resources: {
           cpu: 4
           memory: '8.0Gi'
@@ -1162,7 +1166,7 @@ module avmContainerApp_Web 'br/public:avm/res/app/container-app:0.22.1' = {
     ]
   }
 }
-
+ 
 // ========== Container App Workflow ========== //
 module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.22.1' = {
   name: take('avm.res.app.container-app-wkfl.${solutionSuffix}', 64)
@@ -1172,7 +1176,12 @@ module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.22.1' = {
     environmentResourceId: avmContainerAppEnv.outputs.resourceId
     workloadProfileName: 'Consumption'
     enableTelemetry: enableTelemetry
-    registries: null
+    registries: [
+      {
+        server: avmContainerRegistry.outputs.loginServer
+        identity: avmContainerRegistryReader.outputs.resourceId
+      }
+    ]
     tags: tags
     managedIdentities: {
       systemAssigned: true
@@ -1183,7 +1192,7 @@ module avmContainerApp_Workflow 'br/public:avm/res/app/container-app:0.22.1' = {
     containers: [
       {
         name: 'ca-${solutionSuffix}-wkfl'
-        image: '${containerRegistryEndpoint}/contentprocessorworkflow:${imageTag}'
+        image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
         resources: {
           cpu: 4
           memory: '8.0Gi'
@@ -1550,7 +1559,12 @@ module avmContainerApp_update 'br/public:avm/res/app/container-app:0.22.1' = {
     enableTelemetry: enableTelemetry
     environmentResourceId: avmContainerAppEnv.outputs.resourceId
     workloadProfileName: 'Consumption'
-    registries: null
+    registries: [
+      {
+        server: avmContainerRegistry.outputs.loginServer
+        identity: avmContainerRegistryReader.outputs.resourceId
+      }
+    ]
     tags: tags
     managedIdentities: {
       systemAssigned: true
@@ -1561,8 +1575,8 @@ module avmContainerApp_update 'br/public:avm/res/app/container-app:0.22.1' = {
     containers: [
       {
         name: 'ca-${solutionSuffix}'
-        image: '${containerRegistryEndpoint}/contentprocessor:${imageTag}'
-
+        image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
+ 
         resources: {
           cpu: 4
           memory: '8.0Gi'
@@ -1623,7 +1637,7 @@ module avmContainerApp_update 'br/public:avm/res/app/container-app:0.22.1' = {
     cognitiveServicePrivateEndpoint
   ]
 }
-
+ 
 module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.22.1' = {
   name: take('avm.res.app.container-app-api.update.${solutionSuffix}', 64)
   params: {
@@ -1632,19 +1646,24 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.22.1' =
     enableTelemetry: enableTelemetry
     environmentResourceId: avmContainerAppEnv.outputs.resourceId
     workloadProfileName: 'Consumption'
-    registries: null
+    registries: [
+      {
+        server: avmContainerRegistry.outputs.loginServer
+        identity: avmContainerRegistryReader.outputs.resourceId
+      }
+    ]
     tags: tags
     managedIdentities: {
       systemAssigned: true
       userAssignedResourceIds: [
         avmContainerRegistryReader.outputs.resourceId
       ]
     }
-
+ 
     containers: [
       {
         name: 'ca-${solutionSuffix}-api'
-        image: '${containerRegistryEndpoint}/contentprocessorapi:${imageTag}'
+        image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
         resources: {
           cpu: 4
           memory: '8.0Gi'
@@ -1758,7 +1777,7 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.22.1' =
     cognitiveServicePrivateEndpoint
   ]
 }
-
+ 
 // ========== Container App Workflow Update ========== //
 module avmContainerApp_Workflow_update 'br/public:avm/res/app/container-app:0.22.1' = {
   name: take('avm.res.app.container-app-wkfl.update.${solutionSuffix}', 64)
@@ -1768,7 +1787,12 @@ module avmContainerApp_Workflow_update 'br/public:avm/res/app/container-app:0.22
     enableTelemetry: enableTelemetry
     environmentResourceId: avmContainerAppEnv.outputs.resourceId
     workloadProfileName: 'Consumption'
-    registries: null
+    registries: [
+      {
+        server: avmContainerRegistry.outputs.loginServer
+        identity: avmContainerRegistryReader.outputs.resourceId
+      }
+    ]
     tags: tags
     managedIdentities: {
       systemAssigned: true
@@ -1779,7 +1803,7 @@ module avmContainerApp_Workflow_update 'br/public:avm/res/app/container-app:0.22
     containers: [
       {
         name: 'ca-${solutionSuffix}-wkfl'
-        image: '${containerRegistryEndpoint}/contentprocessorworkflow:${imageTag}'
+        image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
         resources: {
           cpu: 4
           memory: '8.0Gi'