Skip to content

Commit 4051086

Browse files
author
Cephas Lin
committed
add links to sidecar tutorial
1 parent 3a8a87e commit 4051086

12 files changed

+14
-11
lines changed

articles/app-service/configure-custom-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This guide provides key concepts and instructions for containerization of Window
2121

2222
::: zone pivot="container-linux"
2323

24-
This guide provides key concepts and instructions for containerization of Linux apps in App Service. If you've never used Azure App Service, follow the [custom container quickstart](quickstart-custom-container.md) and [tutorial](tutorial-custom-container.md) first. There's also a [multi-container app quickstart](quickstart-multi-container.md) and [tutorial](tutorial-multi-container-app.md).
24+
This guide provides key concepts and instructions for containerization of Linux apps in App Service. If you've never used Azure App Service, follow the [custom container quickstart](quickstart-custom-container.md) and [tutorial](tutorial-custom-container.md) first. There's also a [multi-container app quickstart](quickstart-multi-container.md) and [tutorial](tutorial-multi-container-app.md). For sidecar containers (preview), see [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md).
2525

2626
::: zone-end
2727

articles/app-service/deploy-ci-cd-custom-container.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ Once you authorize your Azure account with GitHub, **select** the **Organization
4343
::: zone pivot="container-linux"
4444
## 3. Configure registry settings
4545

46+
> [!NOTE]
47+
> Sidecar containers (preview) will succeed multi-container (Docker Compose) apps in App Service. To get started, see [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md).
48+
4649
To deploy a multi-container (Docker Compose) app, **select** **Docker Compose** in **Container Type**.
4750

4851
If you don't see the **Container Type** dropdown, scroll back up to **Source** and **select** **Container Registry**.

articles/app-service/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ zone_pivot_groups: app-service-getting-started-stacks
7474
| **Monitor your app**|- [Troubleshoot with Azure Monitor](./tutorial-troubleshoot-monitor.md)<br>- [Log stream](./troubleshoot-diagnostic-logs.md#stream-logs)<br>- [Diagnose and solve tool](./overview-diagnostics.md)|
7575
| **Add domains & certificates** |- [Map a custom domain](./app-service-web-tutorial-custom-domain.md?tabs=root%2Cazurecli)<br>- [Add SSL certificate](./configure-ssl-certificate.md)|
7676
| **Connect to a database** | - [MySQL with PHP](./tutorial-php-mysql-app.md)|
77-
| **Custom containers** |- [Multi-container](./quickstart-multi-container.md)|
77+
| **Custom containers** |- [Multi-container](./quickstart-multi-container.md)<br>- [Sidecar containers](tutorial-custom-container-sidecar.md)|
7878
| **Review best practices** | - [Scale your app]()<br>- [Deployment](./deploy-best-practices.md)<br>- [Security](/security/benchmark/azure/baselines/app-service-security-baseline?toc=/azure/app-service/toc.json)<br>- [Virtual Network](./configure-vnet-integration-enable.md)|
7979
::: zone-end
8080

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-linux-azure-portal-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,4 @@ The App Service app pulls from the container registry every time it starts. If y
145145
> [Configure custom container](../../configure-custom-container.md)
146146
147147
> [!div class="nextstepaction"]
148-
> [Multi-container app tutorial](../../tutorial-multi-container-app.md)
148+
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-linux-visual-studio-code-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ The App Service app pulls from the container registry every time it starts. If y
186186
> [Configure custom container](../../configure-custom-container.md)
187187
188188
> [!div class="nextstepaction"]
189-
> [Multi-container app tutorial](../../tutorial-multi-container-app.md)
189+
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)
190190
191191

192192
Other Azure extensions:

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-azure-portal-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,4 @@ The App Service app pulls from the container registry every time it starts. If y
149149
> [Configure custom container](../../configure-custom-container.md)
150150
151151
> [!div class="nextstepaction"]
152-
> [Multi-container app tutorial](../../tutorial-multi-container-app.md)
152+
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-cli-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ The App Service app pulls from the container registry every time it starts. If y
107107
> [Configure custom container](../../configure-custom-container.md)
108108
109109
> [!div class="nextstepaction"]
110-
> [Multi-container app tutorial](../../tutorial-multi-container-app.md)
110+
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)
111111
112112

113113
<!-- LINKS - internal -->

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-powershell-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,4 @@ The App Service app pulls from the container registry every time it starts. If y
107107
> [Configure custom container](../../configure-custom-container.md)
108108
109109
> [!div class="nextstepaction"]
110-
> [Multi-container app tutorial](../../tutorial-multi-container-app.md)
110+
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-visual-studio-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,4 @@ The streamed logs look like this:
196196
> [Configure custom container](../../configure-custom-container.md)
197197
198198
> [!div class="nextstepaction"]
199-
> [Multi-container app tutorial](../../tutorial-multi-container-app.md)
199+
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)

articles/app-service/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Azure App Service is a fully managed platform as a service (PaaS) offering for d
2424

2525
* **Multiple languages and frameworks** - App Service has first-class support for ASP.NET, ASP.NET Core, Java, Node.js, PHP, or Python. You can also run [PowerShell and other scripts or executables](webjobs-create.md) as background services.
2626
* **Managed production environment** - App Service automatically [patches and maintains the OS and language frameworks](overview-patch-os-runtime.md) for you. Spend time writing great apps and let Azure worry about the platform.
27-
* **Containerization and Docker** - Dockerize your app and host a custom Windows or Linux container in App Service. Run multi-container apps with Docker Compose. Migrate your Docker skills directly to App Service.
27+
* **Containerization and Docker** - Dockerize your app and host a custom Windows or Linux container in App Service. Run sidecar containers of your choice. Migrate your Docker skills directly to App Service.
2828
* **DevOps optimization** - Set up [continuous integration and deployment](deploy-continuous-deployment.md) with Azure DevOps, GitHub, BitBucket, Docker Hub, or Azure Container Registry. Promote updates through [test and staging environments](deploy-staging-slots.md). Manage your apps in App Service by using [Azure PowerShell](/powershell/azure/) or the [cross-platform command-line interface (CLI)](/cli/azure/install-azure-cli).
2929
* **Global scale with high availability** - Scale [up](manage-scale-up.md) or [out](../azure-monitor/autoscale/autoscale-get-started.md) manually or automatically. Host your apps anywhere in Microsoft's global datacenter infrastructure, and the App Service [SLA](https://azure.microsoft.com/support/legal/sla/app-service/) promises high availability.
3030
* **Connections to SaaS platforms and on-premises data** - Choose from [many hundreds of connectors](/connectors/connector-reference/connector-reference-logicapps-connectors) for enterprise systems (such as SAP), SaaS services (such as Salesforce), and internet services (such as Facebook). Access on-premises data using [Hybrid Connections](app-service-hybrid-connections.md) and [Azure Virtual Networks](./overview-vnet-integration.md).

0 commit comments

Comments
 (0)