Skip to content

Commit f58dff5

Browse files
committed
validation
1 parent a647f3e commit f58dff5

File tree

11 files changed

+24
-17
lines changed

11 files changed

+24
-17
lines changed

articles/app-service/configure-language-python.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This article describes how [Azure App Service](overview.md) runs Python apps, ho
1717

1818
The App Service deployment engine automatically activates a virtual environment and runs `pip install -r requirements.txt` for you when you deploy a [Git repository](deploy-local-git.md), or when you deploy a [zip package](deploy-zip.md) [with build automation enabled](deploy-zip.md#enable-build-automation-for-zip-deploy).
1919

20-
This guide provides key concepts and instructions for Python developers who use a built-in Linux container in App Service. If you've never used Azure App Service, first follow the [Python quickstart](quickstart-python.md) and [Python with PostgreSQL tutorial](tutorial-python-postgresql-app.md).
20+
This guide provides key concepts and instructions for Python developers who use a built-in Linux container in App Service. If you've never used Azure App Service, first follow the [Python quickstart](quickstart-python.md) and [Flask](tutorial-python-postgresql-app-flask.md), [Django](tutorial-python-postgresql-app-djanog.md), or [FastAPI](tutorial-python-postgresql-app-fastapi.md) with PostgreSQL tutorial.
2121

2222
You can use either the [Azure portal](https://portal.azure.com) or the Azure CLI for configuration:
2323

@@ -105,17 +105,17 @@ Existing web applications can be redeployed to Azure as follows:
105105
106106
1. **Database**: If your app depends on a database, create the necessary resources on Azure as well.
107107
108-
1. **App service resources**: Create a resource group, App Service plan, and App Service web app to host your application. You can do this easily by running the Azure CLI command [`az webapp up`](/cli/azure/webapp#az-webapp-up). Or, you can create and deploy resources as shown in [Tutorial: Deploy a Python (Django or Flask) web app with PostgreSQL](tutorial-python-postgresql-app.md). Replace the names of the resource group, App Service plan, and web app to be more suitable for your application.
108+
1. **App service resources**: Create a resource group, App Service plan, and App Service web app to host your application. You can do this easily by running the Azure CLI command [`az webapp up`](/cli/azure/webapp#az-webapp-up). Or, you can create and deploy resources as shown in the [Flask](tutorial-python-postgresql-app-flask.md), [Django](tutorial-python-postgresql-app-djanog.md), or [FastAPI](tutorial-python-postgresql-app-fastapi.md) with PostgreSQL tutorial. Replace the names of the resource group, App Service plan, and web app to be more suitable for your application.
109109
110110
1. **Environment variables**: If your application requires any environment variables, create equivalent [App Service application settings](configure-common.md#configure-app-settings). These App Service settings appear to your code as environment variables, as described in [Access environment variables](#access-app-settings-as-environment-variables).
111-
- Database connections, for example, are often managed through such settings, as shown in [Tutorial: Deploy a Django web app with PostgreSQL - verify connection settings](tutorial-python-postgresql-app.md#2-secure-connection-secrets).
111+
- Database connections, for example, are often managed through such settings, as shown in [Tutorial: Deploy a Django web app with PostgreSQL - verify connection settings](tutorial-python-postgresql-app-django.md#2-secure-connection-secrets).
112112
- See [Production settings for Django apps](#production-settings-for-django-apps) for specific settings for typical Django apps.
113113
114114
1. **App startup**: Review the section [Container startup process](#container-startup-process) later in this article to understand how App Service attempts to run your app. App Service uses the Gunicorn web server by default, which must be able to find your app object or *wsgi.py* folder. If you need to, you can [Customize the startup command](#customize-startup-command).
115115
116116
1. **Continuous deployment**: Set up continuous deployment from GitHub Actions, Bitbucket, or Azure Repos as described in the article [Continuous deployment to Azure App Service](deploy-continuous-deployment.md). Or, set up continuous deployment from Local Git as described in the article [Local Git deployment to Azure App Service](deploy-local-git.md).
117117
118-
1. **Custom actions**: To perform actions within the App Service container that hosts your app, such as Django database migrations, you can [connect to the container through SSH](configure-linux-open-ssh-session.md). For an example of running Django database migrations, see [Tutorial: Deploy a Django web app with PostgreSQL - generate database schema](tutorial-python-postgresql-app.md#4-generate-database-schema).
118+
1. **Custom actions**: To perform actions within the App Service container that hosts your app, such as Django database migrations, you can [connect to the container through SSH](configure-linux-open-ssh-session.md). For an example of running Django database migrations, see [Tutorial: Deploy a Django web app with PostgreSQL - generate database schema](tutorial-python-postgresql-app-django.md#4-generate-database-schema).
119119
- When using continuous deployment, you can perform those actions using post-build commands as described earlier under [Customize build automation](#customize-build-automation).
120120
121121
With these steps completed, you should be able to commit changes to your source repository and have those updates automatically deployed to App Service.
@@ -430,7 +430,7 @@ When attempting to run database migrations with a Django app, you might see "sql
430430

431431
Check the `DATABASES` variable in the app's *settings.py* file to ensure that your app is using a cloud database instead of SQLite.
432432

433-
If you're encountering this error with the sample in [Tutorial: Deploy a Django web app with PostgreSQL](tutorial-python-postgresql-app.md), check that you completed the steps in [Verify connection settings](tutorial-python-postgresql-app.md#2-secure-connection-secrets).
433+
If you're encountering this error with the sample in [Tutorial: Deploy a Django web app with PostgreSQL](tutorial-python-postgresql-app-django.md), check that you completed the steps in [Verify connection settings](tutorial-python-postgresql-app-django.md#2-secure-connection-secrets).
434434

435435
#### Other issues
436436

@@ -444,7 +444,9 @@ If you're encountering this error with the sample in [Tutorial: Deploy a Django
444444

445445
## Related content
446446

447-
- [Tutorial: Python app with PostgreSQL](tutorial-python-postgresql-app.md)
447+
- [Tutorial: Flask app with PostgreSQL](tutorial-python-postgresql-app-flask.md)
448+
- [Tutorial: Django app with PostgreSQL](tutorial-python-postgresql-app-django.md)
449+
- [Tutorial: FastAPI app with PostgreSQL](tutorial-python-postgresql-app-fastapi.md)
448450
- [Tutorial: Deploy from private container repository](tutorial-custom-container.md?pivots=container-linux)
449451
- [App Service on Linux FAQ](faq-app-service-linux.yml)
450452
- [Environment variables and app settings reference](reference-app-settings.md)

articles/app-service/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Use the following resources to get started with Python.
4242
| **Deploy your app** | - [Configure Python](configure-language-python.md)<br>- [GitHub Actions](./deploy-github-actions.md) |
4343
| **Monitor your app**| - [Log stream](./troubleshoot-diagnostic-logs.md#stream-logs)<br>- [Diagnose and solve tool](./overview-diagnostics.md)|
4444
| **Add domains & certificates** |- [Map a custom domain](./app-service-web-tutorial-custom-domain.md?tabs=root%2Cazurecli)<br>- [Add an SSL certificate](./configure-ssl-certificate.md)|
45-
| **Connect to a database** | - [PostgreSQL - CLI](./tutorial-python-postgresql-app.md?tabs=flask%2Cwindows&pivots=azure-developer-cli)<br>- [PostgreSQL - Azure portal](./tutorial-python-postgresql-app.md?tabs=flask%2Cwindows&pivots=azure-portal)|
45+
| **Connect to a database** | - [PostgreSQL - CLI](./tutorial-python-postgresql-app-flask.md?pivots=azure-developer-cli)<br>- [PostgreSQL - Azure portal](./tutorial-python-postgresql-app-flask.md?pivots=azure-portal)|
4646
| **Custom containers** |- [Linux - Visual Studio Code](./quickstart-custom-container.md?tabs=python&pivots=container-linux-vscode)|
4747
| **Review best practices** | - [Scale your app](./manage-scale-up.md)<br>- [Deployment](./deploy-best-practices.md)<br>- [Security](/security/benchmark/azure/baselines/app-service-security-baseline?toc=/azure/app-service/toc.json)<br>- [Virtual networks](./configure-vnet-integration-enable.md)|
4848

articles/app-service/includes/tutorial-microsoft-graph-as-app/cleanup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ In this tutorial, you learned how to:
1818
> * Add Microsoft Graph API permissions to a managed identity.
1919
> * Call Microsoft Graph from a web app by using managed identities.
2020
21-
Learn how to connect a [.NET Core app](../../tutorial-dotnetcore-sqldb-app.md), [Python app](../../tutorial-python-postgresql-app.md), [Java app](../../tutorial-java-spring-cosmosdb.md), or [Node.js app](../../tutorial-nodejs-mongodb-app.md) to a database.
21+
Learn how to connect a [.NET Core app](../../tutorial-dotnetcore-sqldb-app.md) or [Node.js app](../../tutorial-nodejs-mongodb-app.md) to a database.

articles/app-service/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ landingContent:
6565
- text: ASP.NET Core and Azure SQL Database
6666
url: tutorial-dotnetcore-sqldb-app.md
6767
- text: Python (Django) and PostgreSQL
68-
url: tutorial-python-postgresql-app.md
68+
url: tutorial-python-postgresql-app-django.md
6969
- text: PHP and MySQL
7070
url: tutorial-php-mysql-app.md
7171
- text: Node.js and MongoDB

articles/app-service/quickstart-arm-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ When no longer needed, [delete the resource group](../azure-resource-manager/man
206206
> [ASP.NET Core with SQL Database](tutorial-dotnetcore-sqldb-app.md)
207207
208208
> [!div class="nextstepaction"]
209-
> [Python with Postgres](tutorial-python-postgresql-app.md)
209+
> [Python with Postgres](tutorial-python-postgresql-app-django.md)
210210
211211
> [!div class="nextstepaction"]
212212
> [PHP with MySQL](tutorial-php-mysql-app.md)

articles/app-service/quickstart-python-1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ The `--no-wait` argument allows the command to return before the operation is co
294294
## Next steps
295295

296296
> [!div class="nextstepaction"]
297-
> [Tutorial: Python (Django) web app with PostgreSQL](tutorial-python-postgresql-app.md)
297+
> [Tutorial: Python (Django) web app with PostgreSQL](tutorial-python-postgresql-app-django.md)
298298
299299
> [!div class="nextstepaction"]
300300
> [Configure Python app](configure-language-python.md)

articles/app-service/quickstart-python-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Having issues? [Let us know](https://aka.ms/FlaskCLIQuickstartHelp).
151151
## Next steps
152152

153153
> [!div class="nextstepaction"]
154-
> [Tutorial: Python (Django) web app with PostgreSQL](./tutorial-python-postgresql-app.md)
154+
> [Tutorial: Python (Django) web app with PostgreSQL](./tutorial-python-postgresql-app-django.md)
155155
156156
> [!div class="nextstepaction"]
157157
> [Configure Python app](configure-language-python.md)

articles/app-service/quickstart-python.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,10 @@ Having issues? [Let us know](https://aka.ms/PythonAppServiceQuickstartFeedback).
394394
## Next steps
395395

396396
> [!div class="nextstepaction"]
397-
> [Tutorial: Python (Django or Flask) web app with PostgreSQL](./tutorial-python-postgresql-app.md)
397+
> [Tutorial: Python (Flask) web app with PostgreSQL](./tutorial-python-postgresql-app-flask.md)
398+
399+
> [!div class="nextstepaction"]
400+
> [Tutorial: Python (Django) web app with PostgreSQL](./tutorial-python-postgresql-app-django.md)
398401
399402
> [!div class="nextstepaction"]
400403
> [Configure a Python app](./configure-language-python.md)

articles/app-service/tutorial-connect-overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ Examples of using application secrets to connect to a database:
8484
- [Tutorial: Deploy an ASP.NET app to Azure with Azure SQL Database](app-service-web-tutorial-dotnet-sqldatabase.md)
8585
- [Tutorial: Deploy a PHP, MySQL, and Redis app to Azure App Service](tutorial-php-mysql-app.md)
8686
- [Deploy a Node.js + MongoDB web app to Azure](tutorial-nodejs-mongodb-app.md)
87-
- [Deploy a Python (Django or Flask) web app with PostgreSQL in Azure](tutorial-python-postgresql-app.md)
87+
- [Deploy a Python (Flask) web app with PostgreSQL in Azure](tutorial-python-postgresql-app-flask.md)
88+
- [Deploy a Python (Django) web app with PostgreSQL in Azure](tutorial-python-postgresql-django.md)
89+
- [Deploy a Python (FastAPI) web app with PostgreSQL in Azure](tutorial-python-postgresql-app-fastapi.md)
8890
- [Tutorial: Build a Tomcat web app with Azure App Service on Linux and MySQL](tutorial-java-tomcat-mysql-app.md)
8991
- [Tutorial: Build a Java Spring Boot web app with Azure App Service on Linux and Azure Cosmos DB](tutorial-java-spring-cosmosdb.md)
9092

articles/app-service/tutorial-send-email.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Deploy an app with the language framework of your choice to App Service. To foll
4343

4444
### [Python](#tab/python)
4545

46-
[Tutorial: Run a Python (Django) web app with PostgreSQL in Azure App Service](tutorial-python-postgresql-app.md)
46+
[Tutorial: Run a Python (Django) web app with PostgreSQL in Azure App Service](tutorial-python-postgresql-app-django.md)
4747

4848
---
4949

@@ -292,7 +292,7 @@ async with aiohttp.post('http://httpbin.org/post', data=json.dump(payload)) as r
292292
print(await resp.status())
293293
``` -->
294294

295-
If you're testing this code on the sample app for [Tutorial: Run a Python (Django) web app with PostgreSQL in Azure App Service](tutorial-python-postgresql-app.md), you could use it to send an email confirmation in the [Route::post function](https://github.com/Azure-Samples/laravel-tasks/blob/master/routes/web.php#L30-L48), just before the return statement.
295+
If you're testing this code on the sample app for [Tutorial: Run a Python (Django) web app with PostgreSQL in Azure App Service](tutorial-python-postgresql-app-django.md), you could use it to send an email confirmation in the [Route::post function](https://github.com/Azure-Samples/laravel-tasks/blob/master/routes/web.php#L30-L48), just before the return statement.
296296

297297
---
298298

0 commit comments

Comments
 (0)