Skip to content

Commit dfddc71

Browse files
authored
Upgrade to AZD 1.10.1 and specify explicit ACA version when deploying (#257)
1 parent f7716a2 commit dfddc71

File tree

6 files changed

+17
-16
lines changed

6 files changed

+17
-16
lines changed

.devcontainer/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"name": "web-app-pattern-dotnet",
33
"build": {
44
"dockerfile": "Dockerfile",
5-
"args": {
5+
"args": {
66
"VARIANT": "8.0-bookworm"
77
}
88
},
99
"runArgs": ["--init", "--privileged"],
1010

1111
"customizations": {
12-
"vscode": {
12+
"vscode": {
1313
"extensions": [
1414
"ms-azuretools.azure-dev",
1515
"ms-azuretools.vscode-azureappservice",
@@ -35,7 +35,7 @@
3535
// - /.github/workflows/azure-dev.yml
3636
// - /.github/workflows/scheduled-azure-dev.yml
3737
// - /.github/workflows/scheduled-azure-teardown.yml
38-
"version": "1.9.5"
38+
"version": "1.10.1"
3939
},
4040
"ghcr.io/devcontainers/features/docker-in-docker:2": {
4141
"version": "latest"
@@ -51,4 +51,4 @@
5151
},
5252
// resolves error: dubious ownership of the workspace folder
5353
"postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}"
54-
}
54+
}

.github/workflows/azure-dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
build:
1313
runs-on: ubuntu-latest
1414
container:
15-
image: mcr.microsoft.com/azure-dev-cli-apps:1.9.5
15+
image: mcr.microsoft.com/azure-dev-cli-apps:1.10.1
1616
steps:
1717
- name: Checkout
1818
uses: actions/checkout@v2
19-
19+
2020
# login to run ado commands such provision, deploy, and down
2121
- name: Log in with Azure (Client Credentials)
2222
if: ${{ env.AZURE_CREDENTIALS != '' }}
@@ -31,7 +31,7 @@ jobs:
3131
shell: pwsh
3232
env:
3333
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
34-
34+
3535
- name: Azure Dev Provision
3636
run: azd provision --no-prompt
3737
env:

.github/workflows/scheduled-azure-dev.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
build:
2121
runs-on: ubuntu-latest
2222
container:
23-
image: mcr.microsoft.com/azure-dev-cli-apps:1.9.5
23+
image: mcr.microsoft.com/azure-dev-cli-apps:1.10.1
2424
env:
2525
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
2626
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
@@ -40,7 +40,7 @@ jobs:
4040
- name: Check configuration
4141
if: ${{ env.AZURE_CLIENT_ID == '' }}
4242
run: echo "AZURE_CLIENT_ID are not available."
43-
43+
4444
# login to run ado commands such provision, deploy, and down
4545
- name: Log in with Azure (Federated Credentials)
4646
if: ${{ env.AZURE_CLIENT_ID != '' }}
@@ -50,7 +50,7 @@ jobs:
5050
--federated-credential-provider "github" `
5151
--tenant-id "$Env:AZURE_TENANT_ID" `
5252
shell: pwsh
53-
53+
5454
# login to run azd hooks and the QA validation script
5555
- name: Log in with Azure CLI
5656
if: ${{ env.AZURE_CLIENT_ID != '' }}

.github/workflows/scheduled-azure-teardown.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
workflow_dispatch:
88
schedule:
99
- cron: '0 13 1 * *' # Run at 13:00 on the 1st day of the month
10-
10+
1111
# https://learn.microsoft.com/en-us/azure/developer/github/connect-from-azure?tabs=azure-portal%2Clinux#set-up-azure-login-with-openid-connect-authentication
1212
permissions:
1313
id-token: write
@@ -19,7 +19,7 @@ jobs:
1919
build:
2020
runs-on: ubuntu-latest
2121
container:
22-
image: mcr.microsoft.com/azure-dev-cli-apps:1.9.5
22+
image: mcr.microsoft.com/azure-dev-cli-apps:1.10.1
2323
env:
2424
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
2525
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install Az module
3636
run: Install-Module -Name Az -Force -AllowClobber -Scope CurrentUser -Repository PSGallery
3737
shell: pwsh
38-
38+
3939
# login to run ado commands such provision, deploy, and down
4040
- name: Log in with Azure (Federated Credentials)
4141
if: ${{ env.AZURE_CLIENT_ID != '' }}
@@ -45,7 +45,7 @@ jobs:
4545
--federated-credential-provider "github" `
4646
--tenant-id "$Env:AZURE_TENANT_ID" `
4747
shell: pwsh
48-
48+
4949
# login to run azd hooks and the QA validation script
5050
- name: Log in with Azure CLI
5151
if: ${{ env.AZURE_CLIENT_ID != '' }}

azure.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ services:
5656
project: src/Relecloud.TicketRenderer
5757
language: dotnet
5858
host: containerapp
59+
apiVersion: 2024-02-02-preview # Force `azd` to use this API version for GET/PATCH operations
5960
docker:
6061
# These paths are relative to the project directory
6162
path: ./Dockerfile

infra/core/compute/postDeploymentScript/post-deployment.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# install AZD - keep this version in sync with the version used in the file /.devcontainer/devcontainer.json file
4-
curl -fsSL https://aka.ms/install-azd.sh | bash -s -- -- version 1.9.5
4+
curl -fsSL https://aka.ms/install-azd.sh | bash -s -- -- version 1.10.1
55

66
# add Microsoft package feed for the dotnet install
77
# Get Ubuntu version
@@ -62,4 +62,4 @@ echo \
6262
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
6363
sudo apt-get update
6464

65-
sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
65+
sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin

0 commit comments

Comments
 (0)