Skip to content

Commit e2241c4

Browse files
authored
Merge pull request #294758 from MicrosoftDocs/main
2/17/2025 AM Publish
2 parents ed5bc82 + ba9bd69 commit e2241c4

36 files changed

+134
-77
lines changed

articles/app-service/app-service-configure-premium-tier.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,16 @@ The Premium V3 tier is available for both native and custom containers, includin
2626

2727
Premium V3 as well as specific Premium V3 SKUs are available in some Azure regions and availability in additional regions is being added continually. To see if a specific PremiumV3 offering is available in your region, run the following Azure CLI command in the [Azure Cloud Shell](../cloud-shell/overview.md) (substitute _P1v3_ with the desired SKU):
2828

29+
**Windows** SKU availability
30+
2931
```azurecli-interactive
3032
az appservice list-locations --sku P1V3
3133
```
34+
**Linux** SKU availability
35+
36+
```azurecli-interactive
37+
az appservice list-locations --linux-workers-enabled --sku P1V3
38+
```
3239

3340
<a name="create"></a>
3441

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

Lines changed: 3 additions & 3 deletions
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're new to Azure App Service, follow the [custom container quickstart](quickstart-custom-container.md) and [tutorial](tutorial-custom-container.md) first. For sidecar containers (preview), see [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md).
24+
This guide provides key concepts and instructions for containerization of Linux apps in App Service. If you're new to Azure App Service, follow the [custom container quickstart](quickstart-custom-container.md) and [tutorial](tutorial-custom-container.md) first. For sidecar containers, see [Tutorial: Configure a sidecar container for custom container in Azure App Service](tutorial-custom-container-sidecar.md).
2525

2626
::: zone-end
2727

@@ -478,7 +478,7 @@ Further troubleshooting information is available at the Azure App Service blog:
478478
## Configure multi-container apps
479479
480480
> [!NOTE]
481-
> Sidecar containers (preview) will succeed multi-container 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).
481+
> Sidecar containers will succeed multi-container apps in App Service. To get started, see [Tutorial: Configure a sidecar container for custom container in Azure App Service](tutorial-custom-container-sidecar.md).
482482
483483
- [Use persistent storage in Docker Compose](#use-persistent-storage-in-docker-compose)
484484
- [Preview limitations](#preview-limitations)
@@ -562,7 +562,7 @@ The following lists show supported and unsupported Docker Compose configuration
562562
::: zone pivot="container-linux"
563563

564564
> [!div class="nextstepaction"]
565-
> [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md)
565+
> [Tutorial: Configure a sidecar container for custom container in Azure App Service](tutorial-custom-container-sidecar.md)
566566

567567
::: zone-end
568568

articles/app-service/reference-app-settings.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ The following environment variables are related to the app environment in genera
2626
| `WEBSITE_PLATFORM_VERSION` | Read-only. App Service platform version. ||
2727
| `HOME` | Read-only. Path to the home directory (for example, `D:\home` for Windows). ||
2828
| `SERVER_PORT` | Read-only. The port the app should listen to. | |
29-
| `WEBSITE_WARMUP_PATH` | A relative path to ping to warm up the app, beginning with a slash. The default is `/`, which pings the root path. The specific path can be pinged by an unauthenticated client, such as Azure Traffic Manager, even if [App Service authentication](overview-authentication-authorization.md) is set to reject unauthenticated clients. (NOTE: This app setting doesn't change the path used by AlwaysOn.) ||
29+
| `WEBSITE_WARMUP_PATH` | A relative path to ping to warm up the app, beginning with a slash. The default is `/robots933456.txt`. Whenever the platform starts up a container, the orchestrator makes repeated requests against this endpoint. The platform considers any response from this endpoint as an indication that the container is ready. Once the platform considers the container to be ready, it starts forwarding organic traffic to the newly started container. Unless `WEBSITE_WARMUP_STATUSES` is configured, the platform will consider any response from the container at this endpoint - even error codes such as 404 or 502 - as an indication that the container is ready. Note that this appsetting doesn't change the path used by AlwaysOn. ||
30+
| `WEBSITE_WARMUP_STATUSES` | A comma-delimited list of HTTP status codes that will be considered successful when the platform makes warmup pings against a newly started container. Used in conjunction with `WEBSITE_WARMUP_PATH`. By default, any status code is considered an indication that the container is ready for organic traffic. This appsetting can be used to require a specific response before organic traffic is routed to the container. `Example: 200,202`. If pings against the app's configured warmup path receive a response with a 200 or 202 status code, organic traffic will be routed to the container. If a status code that is not in the list is received (such as 502), the platform will continue making pings until (1) a 200 or 202 is received, or (2) the container startup timeout limit is reached (see `WEBSITES_CONTAINER_START_TIME_LIMIT`). Note that if the container doesn't respond with an HTTP status code that is in the list, the platform will eventually fail the startup attempt and retry, which will result in 503 errors. ||
3031
| `WEBSITE_COMPUTE_MODE` | Read-only. Specifies whether app runs on dedicated (`Dedicated`) or shared (`Shared`) VM/s. ||
3132
| `WEBSITE_SKU` | Read-only. SKU of the app. Possible values are `Free`, `Shared`, `Basic`, and `Standard`. ||
3233
| `SITE_BITNESS` | Read-only. Shows whether the app is 32-bit (`x86`) or 64-bit (`AMD64`). ||
@@ -49,6 +50,9 @@ The following environment variables are related to the app environment in genera
4950
| `WEBSITE_SCM_SEPARATE_STATUS` | Read-only. Shows whether the Kudu app is running in a separate process (`1`) or not (`0`). ||
5051
| `WEBSITE_DNS_ATTEMPTS` | Number of times to try name resolve. ||
5152
| `WEBSITE_DNS_TIMEOUT` | Number of seconds to wait for name resolve ||
53+
| `WEBSITES_CONTAINER_START_TIME_LIMIT` | The amount of time (in seconds) that the platform will wait for a container to become ready on startup. This setting applies to both code-based and container-based apps on App Service for Linux. The default value is `230`. When a container starts up, repeated pings are made against the container to gauge its readiness to serve organic traffic (see `WEBSITE_WARMUP_PATH` and `WEBSITE_WARMUP_STATUSES`). These pings are continuously made until either of the following is true: (1) a successful response is received, or (2) the start time limit is reached. If the container isn't deemed ready within the configured timeout, the platform will fail the startup attempt and retry, which will result in 503 errors. For App Service for Windows Containers, the default start time limit is `10 mins`. You can change the start time limit by specifying a timespan like this `00:05:00`, which indicates 5 minutes.||
54+
55+
5256
<!--
5357
WEBSITE_PROACTIVE_STACKTRACING_ENABLED
5458
WEBSITE_CLOUD_NAME
@@ -336,8 +340,7 @@ For more information on custom containers, see [Run a custom container in Azure]
336340

337341
| Setting name| Description | Example |
338342
|-|-|-|
339-
| `WEBSITES_ENABLE_APP_SERVICE_STORAGE` | For Linux custom containers: set to `true` to enable the `/home` directory to be shared across scaled instances. The default is `false` for Linux custom containers.<br/><br/>For Windows containers: set to `true` to enable the `c:\home` directory to be shared across scaled instances. The default is `true` for Windows containers.||
340-
| `WEBSITES_CONTAINER_START_TIME_LIMIT` | Amount of time in seconds to wait for the container to complete start-up before restarting the container. Default is `230`. You can increase it up to the maximum of `1800`. ||
343+
| `WEBSITES_ENABLE_APP_SERVICE_STORAGE` | For Linux containers, if this app setting is not specified, the `/home` directory is shared across scaled instances by default. You can set it to `false` to disable sharing.<br/><br/>For Windows containers: set to `true` to enable the `c:\home` directory to be shared across scaled instances. The default is `true` for Windows containers.||
341344
| `WEBSITES_CONTAINER_STOP_TIME_LIMIT` | Amount of time in seconds to wait for the container to terminate gracefully. Default is `5`. You can increase to a maximum of `120` ||
342345
| `DOCKER_REGISTRY_SERVER_URL` | URL of the registry server, when running a custom container in App Service. For security, this variable isn't passed on to the container. | `https://<server-name>.azurecr.io` |
343346
| `DOCKER_REGISTRY_SERVER_USERNAME` | Username to authenticate with the registry server at `DOCKER_REGISTRY_SERVER_URL`. For security, this variable isn't passed on to the container. ||

articles/app-service/tutorial-custom-container-sidecar.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,6 @@ You configure sidecar-enabled apps differently than apps that aren't sidecar-ena
170170
## More resources
171171

172172
- [Configure custom container](configure-custom-container.md)
173+
- [Try out sidecars in this guided lab](https://mslabs.cloudguides.com/guides/Sidecars%20in%20Azure%20App%20Service)
173174
- [Deploy custom containers with GitHub Actions](deploy-container-github-action.md)
174175
- [OpenTelemetry](https://opentelemetry.io/)

articles/app-service/tutorial-sidecar.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,5 +272,6 @@ You can use a similar approach to instrument apps in other language stacks. For
272272

273273
## More resources
274274

275+
- [Try out sidecars in this guided lab](https://mslabs.cloudguides.com/guides/Sidecars%20in%20Azure%20App%20Service)
275276
- [Deploy to App Service using GitHub Actions](deploy-github-actions.md)
276277
- [OpenTelemetry](https://opentelemetry.io/)

articles/communication-services/.openpublishing.redirection.communication-services.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"redirections": [
33
{
44
"source_path_from_root": "/articles/communication-services/concepts/client-and-server-architecture.md",
5-
"redirect_url": "https://learn.microsoft.com/azure/architecture/guide/mobile/azure-communication-services-architecture",
5+
"redirect_url": "/azure/communication-services/concepts/identity-model#client-server-architecture",
66
"redirect_document_id": false
77
},
88
{

articles/communication-services/concepts/authentication.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ The user identity is intended to act as a primary key for logs and metrics colle
9999
> [Trusted authentication service hero sample](../samples/trusted-auth-sample.md)
100100
101101
For more information, see the following articles:
102-
- [Learn about client and server architecture](../concepts/client-and-server-architecture.md)
102+
- [Learn about client and server architecture](../concepts/identity-model.md#client-server-architecture)

0 commit comments

Comments
 (0)