Skip to content

Commit 0cb71bb

Browse files
author
Jill Grant
authored
Merge pull request #270405 from msangapu-msft/sidecar-tutorial
Sidecar tutorial
2 parents 65f3343 + f18e341 commit 0cb71bb

20 files changed

+220
-43
lines changed

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

Lines changed: 32 additions & 32 deletions
Large diffs are not rendered by default.

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
@@ -146,4 +146,4 @@ The App Service app pulls from the container registry every time it starts. If y
146146
> [Configure custom container](../../configure-custom-container.md)
147147
148148
> [!div class="nextstepaction"]
149-
> [Multi-container app tutorial](../../tutorial-multi-container-app.md)
149+
> [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
@@ -187,7 +187,7 @@ The App Service app pulls from the container registry every time it starts. If y
187187
> [Configure custom container](../../configure-custom-container.md)
188188
189189
> [!div class="nextstepaction"]
190-
> [Multi-container app tutorial](../../tutorial-multi-container-app.md)
190+
> [Sidecar container tutorial](../../tutorial-custom-container-sidecar.md)
191191
192192

193193
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)
43.4 KB
Loading

0 commit comments

Comments
 (0)