Skip to content

chore: merge main to dev #600

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
Roopan-Microsoft merged 5 commits into from
Sep 22, 2025
Merged

chore: merge main to dev #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
599e4f6
Merge pull request #593 from microsoft/dev
Roopan-Microsoft Sep 18, 2025
6695976
Update container image tags to include version and output URLs for ba…
Harsh-Microsoft Sep 22, 2025
2736965
Correct indentation in resource group tags section
Harsh-Microsoft Sep 22, 2025
f0c46e9
Merge pull request #597 from microsoft/dev
Roopan-Microsoft Sep 22, 2025
e16251b
Merge pull request #599 from microsoft/hb-update-tag
Roopan-Microsoft Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ param backendContainerRegistryHostname string = 'kmcontainerreg.azurecr.io'
param backendContainerImageName string = 'km-api'

@description('Optional. The Container Image Tag to deploy on the backend.')
param backendContainerImageTag string = 'latest_waf'
param backendContainerImageTag string = 'latest_waf_2025-09-18_898'

@description('Optional. The Container Registry hostname where the docker images for the frontend are located.')
param frontendContainerRegistryHostname string = 'kmcontainerreg.azurecr.io'
Expand All @@ -110,7 +110,7 @@ param frontendContainerRegistryHostname string = 'kmcontainerreg.azurecr.io'
param frontendContainerImageName string = 'km-app'

@description('Optional. The Container Image Tag to deploy on the frontend.')
param frontendContainerImageTag string = 'latest_waf'
param frontendContainerImageTag string = 'latest_waf_2025-09-18_898'

@description('Optional. The tags to apply to all deployed Azure resources.')
param tags resourceInput<'Microsoft.Resources/resourceGroups@2025-04-01'>.tags = {}
Expand Down Expand Up @@ -219,7 +219,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
{
TemplateName: 'KM Generic'
CreatedBy: createdBy
},
},
tags
)
}
Expand Down Expand Up @@ -1569,7 +1569,7 @@ output AZURE_EXISTING_AI_PROJECT_RESOURCE_ID string = existingAiFoundryAiProject
output APPLICATIONINSIGHTS_CONNECTION_STRING string = enableMonitoring ? applicationInsights!.outputs.connectionString : ''

@description('Contains API application URL.')
output API_APP_URL string = 'https://app-${solutionName}.azurewebsites.net'
output API_APP_URL string = 'https://api-${solutionSuffix}.azurewebsites.net'

@description('Contains web application URL.')
output WEB_APP_URL string = 'https://api-${solutionName}.azurewebsites.net'
output WEB_APP_URL string = 'https://app-${solutionSuffix}.azurewebsites.net'
10 changes: 5 additions & 5 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.37.4.10188",
"templateHash": "18295975344394141399"
"templateHash": "15438166002668413819"
}
},
"parameters": {
Expand Down Expand Up @@ -168,7 +168,7 @@
},
"backendContainerImageTag": {
"type": "string",
"defaultValue": "latest_waf",
"defaultValue": "latest_waf_2025-09-18_898",
"metadata": {
"description": "Optional. The Container Image Tag to deploy on the backend."
}
Expand All @@ -189,7 +189,7 @@
},
"frontendContainerImageTag": {
"type": "string",
"defaultValue": "latest_waf",
"defaultValue": "latest_waf_2025-09-18_898",
"metadata": {
"description": "Optional. The Container Image Tag to deploy on the frontend."
}
Expand Down Expand Up @@ -60138,14 +60138,14 @@
"metadata": {
"description": "Contains API application URL."
},
"value": "[format('https://app-{0}.azurewebsites.net', parameters('solutionName'))]"
"value": "[format('https://api-{0}.azurewebsites.net', variables('solutionSuffix'))]"
},
"WEB_APP_URL": {
"type": "string",
"metadata": {
"description": "Contains web application URL."
},
"value": "[format('https://api-{0}.azurewebsites.net', parameters('solutionName'))]"
"value": "[format('https://app-{0}.azurewebsites.net', variables('solutionSuffix'))]"
}
}
}
Loading