Skip to content

Commit 259e7a5

Browse files
committed
Add containerapps as a commented out host option
1 parent 7e49c99 commit 259e7a5

File tree

11 files changed

+25
-144
lines changed

11 files changed

+25
-144
lines changed

.azdo/pipelines/azure-dev.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ steps:
109109
AZURE_ADLS_GEN2_STORAGE_ACCOUNT: $(AZURE_ADLS_GEN2_STORAGE_ACCOUNT)
110110
AZURE_ADLS_GEN2_FILESYSTEM_PATH: $(AZURE_ADLS_GEN2_FILESYSTEM_PATH)
111111
AZURE_ADLS_GEN2_FILESYSTEM: $(AZURE_ADLS_GEN2_FILESYSTEM)
112+
DEPLOYMENT_TARGET: $(DEPLOYMENT_TARGET)
113+
AZURE_CONTAINER_APPS_WORKLOAD_PROFILE: $(AZURE_CONTAINER_APPS_WORKLOAD_PROFILE)
112114

113115
- task: AzureCLI@2
114116
displayName: Deploy Application

.github/workflows/azure-dev.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ jobs:
9393
AZURE_ADLS_GEN2_STORAGE_ACCOUNT: ${{ vars.AZURE_ADLS_GEN2_STORAGE_ACCOUNT }}
9494
AZURE_ADLS_GEN2_FILESYSTEM_PATH: ${{ vars.AZURE_ADLS_GEN2_FILESYSTEM_PATH }}
9595
AZURE_ADLS_GEN2_FILESYSTEM: ${{ vars.AZURE_ADLS_GEN2_FILESYSTEM }}
96+
DEPLOYMENT_TARGET: ${{ vars.DEPLOYMENT_TARGET }}
97+
AZURE_CONTAINER_APPS_WORKLOAD_PROFILE: ${{ vars.AZURE_CONTAINER_APPS_WORKLOAD_PROFILE }}
9698

9799
steps:
98100
- name: Checkout

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,5 @@ If you followed the steps above to install the pre-commit hooks, then you can ju
166166

167167
When adding new azd environment variables, please remember to update:
168168
1. App Service's [azure.yaml](./azure.yaml)
169-
2. Azure Container Apps' [azure.yaml](./containerapps/azure.yaml)
170-
3. [ADO pipeline](.azdo/pipelines/azure-dev.yml).
171-
4. [Github workflows](.github/workflows/azure-dev.yml)
169+
1. [ADO pipeline](.azdo/pipelines/azure-dev.yml).
170+
1. [Github workflows](.github/workflows/azure-dev.yml)

README.md

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -154,18 +154,6 @@ It will look like the following:
154154

155155
> NOTE: It may take 5-10 minutes after you see 'SUCCESS' for the application to be fully deployed. If you see a "Python Developer" welcome screen or an error page, then wait a bit and refresh the page. See [guide on debugging App Service deployments](docs/appservice.md).
156156

157-
### Deploying to Azure Container Apps
158-
159-
By default, this project is deployed to Azure App Service. If you want to deploy to Azure Container Apps, please run:
160-
161-
```bash
162-
cd containerapps
163-
azd env new
164-
azd env set DEPLOYMENT_TARGET containerapps
165-
azd up
166-
```
167-
The `.azure/{env name}/.env` file can be found in the `containerapps` folder.
168-
169157
### Deploying again
170158

171159
If you've only changed the backend/frontend code in the `app` folder, then you don't need to re-provision the Azure resources. You can just run:

azure.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ services:
77
backend:
88
project: ./app/backend
99
language: py
10+
# Please check docs/azure_container_apps.md for more information on how to deploy to azure container apps
11+
# host: containerapp
1012
host: appservice
1113
hooks:
12-
prepackage:
14+
prebuild:
1315
windows:
1416
shell: pwsh
1517
run: cd ../frontend;npm install;npm run build
@@ -86,6 +88,8 @@ pipeline:
8688
- AZURE_ADLS_GEN2_STORAGE_ACCOUNT
8789
- AZURE_ADLS_GEN2_FILESYSTEM_PATH
8890
- AZURE_ADLS_GEN2_FILESYSTEM
91+
- DEPLOYMENT_TARGET
92+
- AZURE_CONTAINER_APPS_WORKLOAD_PROFILE
8993
secrets:
9094
- AZURE_SERVER_APP_SECRET
9195
- AZURE_CLIENT_APP_SECRET

containerapps/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

containerapps/app

Lines changed: 0 additions & 1 deletion
This file was deleted.

containerapps/azure.yaml

Lines changed: 0 additions & 119 deletions
This file was deleted.

containerapps/data

Lines changed: 0 additions & 1 deletion
This file was deleted.

containerapps/scripts

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)