Skip to content

Commit 35879e1

Browse files
Update Azure configuration to enhance deployment scripts and adjust monitoring settings
1 parent ff2a419 commit 35879e1

2 files changed

Lines changed: 150 additions & 231 deletions

File tree

azure_custom.yaml

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
# yaml-language-server: $schema=https://raw.githubusercontent.com/Azure/azure-dev/main/schemas/v1.0/azure.yaml.json
1+
environment:
2+
name: document-generation
3+
location: eastus
24

35
name: document-generation
46
metadata:
@@ -7,32 +9,33 @@ metadata:
79
requiredVersions:
810
azd: '>= 1.18.0'
911

10-
# No services defined - Container App is fully managed by Bicep
11-
# This prevents azd from trying to use its broken Container Apps integration
12+
parameters:
13+
solutionPrefix:
14+
type: string
15+
default: bs-azdtest
16+
otherLocation:
17+
type: string
18+
default: eastus2
19+
baseUrl:
20+
type: string
21+
default: 'https://github.com/microsoft/document-generation-solution-accelerator'
22+
23+
deployment:
24+
mode: Incremental
25+
template: ./infra/main.bicep # Path to the main.bicep file inside the 'deployment' folder
26+
parameters:
27+
solutionPrefix: ${parameters.solutionPrefix}
28+
otherLocation: ${parameters.otherLocation}
29+
baseUrl: ${parameters.baseUrl}
1230

1331
hooks:
14-
preprovision:
15-
windows:
16-
shell: pwsh
17-
run: |
18-
./scripts/auth_init.ps1
19-
Write-Host "Building and pushing Docker image to ACR..." -ForegroundColor Yellow
20-
./scripts/build-push-acr.ps1
21-
interactive: true
22-
continueOnError: false
23-
posix:
24-
shell: sh
25-
run: |
26-
./scripts/auth_init.sh
27-
echo "Building and pushing Docker image to ACR..."
28-
bash ./scripts/build-push-acr.sh
29-
interactive: true
30-
continueOnError: false
3132
postprovision:
3233
windows:
3334
run: |
3435
./scripts/auth_update.ps1
35-
Write-Host "Web app URL: "
36+
Write-Host "`nBuilding and pushing Docker image to ACR..." -ForegroundColor Yellow
37+
./scripts/build-push-acr.ps1
38+
Write-Host "`nWeb app URL: "
3639
Write-Host "$env:WEB_APP_URL" -ForegroundColor Cyan
3740
Write-Host "`nIf you want to use the Sample Data, run the following command in the Bash terminal to process it:"
3841
Write-Host "bash ./infra/scripts/process_sample_data.sh" -ForegroundColor Cyan
@@ -42,11 +45,15 @@ hooks:
4245
posix:
4346
run: |
4447
./scripts/auth_update.sh
48+
echo ""
49+
echo "Building and pushing Docker image to ACR..."
50+
bash ./scripts/build-push-acr.sh
51+
echo ""
4552
echo "Web app URL: "
4653
echo $WEB_APP_URL
4754
echo ""
4855
echo "If you want to use the Sample Data, run the following command in the bash terminal to process it:"
4956
echo "bash ./infra/scripts/process_sample_data.sh"
5057
shell: sh
5158
continueOnError: false
52-
interactive: true
59+
interactive: true

0 commit comments

Comments
 (0)