FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

chore: Main to Dev downMerge by Vamshi-Microsoft · Pull Request #653 · microsoft/content-processing-solution-accelerator · GitHub

  1. microsoft
  2. content-processing-solution-accelerator

Repository navigation

chore: Main to Dev downMerge #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Avijit-Microsoft merged 21 commits into from
Jul 14, 2026
Conversation 7 Commits 21 Checks 9 Files changed
Merged

chore: Main to Dev downMerge #653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
8d7c18f
chore: update CODEOWNERS handles
Rafi-Mohammad-69 Jun 29, 2026
7f519a2
chore: update CODEOWNERS handles
Avijit-Microsoft Jun 29, 2026
d99e090
chore: Dev to Main
Avijit-Microsoft Jun 29, 2026
d4264fd
Create script to build and push image
chaudhariniraj Jul 2, 2026
e9422c0
revert unnecessary change
chaudhariniraj Jul 2, 2026
e43b016
Update the script
chaudhariniraj Jul 2, 2026
318391b
Revert unnecessary changes from main.parametres.json
chaudhariniraj Jul 3, 2026
9f9ae02
bicep build changes
chaudhariniraj Jul 3, 2026
98dac8c
Update deployment guide
chaudhariniraj Jul 3, 2026
3f69b91
update scripts
chaudhariniraj Jul 3, 2026
82a7711
resolve copilot comment
chaudhariniraj Jul 3, 2026
60197dc
Update image
chaudhariniraj Jul 3, 2026
201fc45
Update bicep build version
chaudhariniraj Jul 3, 2026
5614b5f
Merge pull request #648 from chaudhariniraj/psl-add-acr
Roopan-Microsoft Jul 3, 2026
b86fbae
Update acr script to handle WAF deployment
chaudhariniraj Jul 6, 2026
dc9941e
resolve copilot comment
chaudhariniraj Jul 6, 2026
113ef2a
Update container registry code
chaudhariniraj Jul 8, 2026
88918f8
Resolve Copilot comment
chaudhariniraj Jul 8, 2026
591debf
Merge pull request #649 from chaudhariniraj/psl-add-acr
Roopan-Microsoft Jul 8, 2026
5e09c5c
Update deployment script and azure.yaml
chaudhariniraj Jul 9, 2026
deab07d
Merge pull request #650 from chaudhariniraj/psl-add-acr
Roopan-Microsoft Jul 9, 2026
File filter

Filter by extension

Filter by extension .bicep  (3) .json  (3) .md  (1) .ps1  (1) .sh  (1) .yaml  (1) No extension  (1) All 7 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 2 additions & 9 deletions azure.yaml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}

32 changes: 31 additions & 1 deletion docs/DeploymentGuide.md
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
90 changes: 57 additions & 33 deletions infra/main.bicep
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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'
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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'
Expand Down Expand Up @@ -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
Expand All @@ -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'
Expand Down Expand Up @@ -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: {
Expand All @@ -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'
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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'
Expand Down
Loading
Loading
Back | FazBrowse Home | New Git URL