Skip to content

Commit a7e02e7

Browse files
committed
Updates for latest azd version
1 parent bb36d72 commit a7e02e7

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

.devcontainer/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ RUN curl -fsSL https://aka.ms/install-azd.sh | bash
66
ENV PYTHONUNBUFFERED 1
77

88
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
9-
&& apt-get -y install --no-install-recommends postgresql-client
9+
&& apt-get -y install --no-install-recommends postgresql-client \
10+
&& apt-get update && apt-get install -y xdg-utils \
11+
&& apt-get clean -y && rm -rf /var/lib/apt/lists/*
12+
13+
RUN curl -fsSL https://aka.ms/install-azd.sh | bash

.devcontainer/devcontainer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Python 3 & PostgreSQL",
2+
"name": "msdocs-flask-postgresql-sample-app",
33
"dockerComposeFile": "docker-compose.yml",
44
"service": "app",
55
"workspaceFolder": "/workspace",
@@ -37,9 +37,6 @@
3737
"python.testing.pytestPath": "/usr/local/py-utils/bin/pytest"
3838
},
3939
"features": {
40-
"ghcr.io/devcontainers/features/azure-cli:1": {
41-
"version": "latest"
42-
},
4340
"ghcr.io/devcontainers/features/github-cli:1": {
4441
"version": "latest"
4542
}

.github/workflows/azure-dev.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@ jobs:
1616
uses: actions/checkout@v2
1717

1818
- name: Log in with Azure
19-
uses: azure/login@v1
20-
with:
21-
creds: ${{ secrets.AZURE_CREDENTIALS }}
19+
run: |
20+
$info = $Env:AZURE_CREDENTIALS | ConvertFrom-Json -AsHashtable;
21+
Write-Host "::add-mask::$($info.clientSecret)"
22+
23+
azd login `
24+
--client-id "$($info.clientId)" `
25+
--client-secret "$($info.clientSecret)" `
26+
--tenant-id "$($info.tenantId)"
27+
shell: pwsh
28+
env:
29+
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
2230

2331
- name: Azure Dev Provision
2432
run: azd provision --no-prompt

infra/resources.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ resource web 'Microsoft.Web/sites@2022-03-01' = {
9292
serverFarmId: appServicePlan.id
9393
siteConfig: {
9494
alwaysOn: true
95-
linuxFxVersion: 'PYTHON|3.10'
95+
linuxFxVersion: 'PYTHON|3.9'
9696
ftpsState: 'Disabled'
9797
appCommandLine: 'startup.sh'
9898
}

0 commit comments

Comments
 (0)