Skip to content

Commit 3d6ba72

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into waf-tshoot
2 parents 7c2605e + 4a50575 commit 3d6ba72

34 files changed

Lines changed: 1666 additions & 1506 deletions

articles/application-gateway/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
href: https://azure.microsoft.com/develop/nodejs/#azure-sdk
350350
- name: Python
351351
href: https://azure.microsoft.com/develop/python/
352-
- name: REST
352+
- name: REST API
353353
href: /rest/api/application-gateway/application-gateways
354354
- name: Azure Resource Manager
355355
displayName: ARM

articles/azure-resource-manager/management/relocation/relocation-firewall.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ If you're running classic firewall rules without Firewall policy, migrate to Fir
111111
- `firewallPolicy.id` with your policy ID.
112112
113113
1. [Create a new firewall policy](/azure/firewall-manager/create-policy-powershell) using the configuration of the source region and reflect changes introduced by the new target region (IP Address Ranges, Public IP, Rule Collections).
114-
1. If you're using Premium SKU and you want to enable TLS Inspection, update the newly created firewall policy and enable TLS inspection by following [the instructions here](https://techcommunity.microsoft.com/t5/azure-network-security-blog/building-a-poc-for-tls-inspection-in-azure-firewall/ba-p/3676723).
114+
1. If you're using Premium SKU and you want to enable TLS Inspection, update the newly created firewall policy and enable TLS inspection by following [the instructions here](https://techcommunity.microsoft.com/blog/azurenetworksecurityblog/building-a-poc-for-tls-inspection-in-azure-firewall/3676723).
115115
1. Review and update the following settings to reflect the changes required for the target region.
116116
117117
- **IP Groups.** To include IP addresses from the target region, if different from the source, *IP Groups* should be reviewed. The IP addresses included in the groups must be modified.

articles/container-apps/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ items:
236236
href: troubleshooting.md
237237
- name: Errors and failures
238238
items:
239-
- name: Container create
239+
- name: Container exits
240240
href: troubleshoot-container-create-failures.md
241241
- name: Open Container Initiative (OCI)
242242
href: troubleshoot-open-container-initiative-errors.md
Lines changed: 48 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,157 +1,125 @@
11
---
2-
title: 'Quickstart: Deploy an existing container image in the Azure portal'
3-
description: Deploy an existing container image to Azure Container Apps using the Azure portal.
2+
title: 'Quickstart: Deploy an Existing Container Image in the Azure Portal'
3+
description: Deploy an existing container image to Azure Container Apps by using the Azure portal.
44
services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.topic: quickstart
8-
ms.date: 10/14/2024
8+
ms.date: 03/26/2026
99
ms.author: cshoe
10-
zone_pivot_groups: container-apps-registry-types
1110
---
1211

1312
# Quickstart: Deploy an existing container image in the Azure portal
1413

15-
Azure Container Apps enables you to run microservices and containerized applications on a serverless platform. With Container Apps, you enjoy the benefits of running containers while leaving behind the concerns of manually configuring cloud infrastructure and complex container orchestrators.
14+
Azure Container Apps allows you to run microservices and containerized applications on a serverless platform. With Container Apps, you enjoy the benefits of running containers while leaving behind the concerns of manually configuring cloud infrastructure and complex container orchestrators.
1615

17-
This article demonstrates how to deploy an existing container to Azure Container Apps using the Azure portal.
16+
This article demonstrates how to deploy an existing container to Azure Container Apps by using the Azure portal.
1817

1918
> [!NOTE]
2019
> Private registry authorization is supported via registry username and password.
2120
2221
## Prerequisites
2322

24-
- Azure account with an active subscription.
25-
- If you don't have one, you [can create one for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
26-
## Setup
27-
28-
Begin by signing in to the [Azure portal](https://portal.azure.com).
23+
- An Azure account with an active subscription. If you don't have one, you can [create one for free](https://azure.microsoft.com/pricing/purchase-options/azure-account?cid=msft_learn).
2924

3025
## Create a container app
3126

3227
To create your container app, start at the Azure portal home page.
3328

34-
1. Search for **Container Apps** in the top search bar.
35-
1. Select **Container Apps** in the search results.
36-
1. Select the **Create** button.
29+
1. Sign in to the [Azure portal](https://portal.azure.com).
3730

38-
### Basics tab
31+
1. Search for and select **Container Apps** in the search bar.
3932

40-
In the *Basics* tab, do the following actions.
33+
1. Select the **Create** button, then choose **+ Container App**.
4134

42-
#### Enter project details
35+
### Basics tab
36+
37+
On the **Basics** tab, enter the following information:
4338

4439
| Setting | Action |
4540
|---|---|
4641
| Subscription | Select your Azure subscription. |
47-
| Resource group | Select **Create new** and enter **my-container-apps**. |
48-
| Container app name | Enter **my-container-app**. |
49-
50-
#### Create an environment
42+
| Resource group | Select **Create new** and enter *my-container-apps*. |
43+
| Container app name | Enter *my-container-app*. |
44+
| Optimize for Azure Functions | Leave the checkbox unchecked. |
45+
| Deployment source | Select **Container image**. |
46+
| Region | Select **Canada Central**. |
47+
| Container Apps environment | Accept the default. |
5148

52-
1. In the *Create Container App environment* field, select **Create new**.
53-
1. In the *Create Container App Environment* page on the *Basics* tab, enter the following values:
49+
Select **Next: Container**.
5450

55-
| Setting | Value |
56-
|---|---|
57-
| Environment name | Enter **my-environment**. |
58-
| Region | Select **Canada Central**. |
51+
### Container tab
5952

60-
1. Select the **Monitoring** tab to create a Log Analytics workspace.
61-
1. Select **Create new** in the *Log Analytics workspace* field.
62-
1. Enter **my-container-apps-logs** in the *Name* field of the *Create new Log Analytics Workspace* dialog.
63-
64-
The *Location* field is pre-filled with *Canada Central* for you.
53+
On the **Container** tab, enter the following information:
6554

66-
1. Select **OK**.
67-
1. Select the **Create** button at the bottom of the *Create Container App Environment* page.
68-
1. Select the **Next: App settings** button at the bottom of the page.
69-
70-
### App settings tab
71-
72-
In the *App settings* tab, do the following actions:
73-
74-
::: zone pivot="container-apps-private-registry"
7555
| Setting | Action |
7656
|---|---|
77-
| Use quickstart image | **Uncheck** the checkbox. |
78-
| Name | Enter **my-portal-app**. |
57+
| Use quickstart image | Uncheck the checkbox. |
58+
| Name | Enter *my-portal-app*. |
7959
| Image source | Select your container image repository source. If your container is hosted in a registry other than **Azure Container Registry**, select **Docker Hub or other registries**. |
80-
| Image type | Select **Private**. |
81-
| Registry login server | Enter the domain (including subdomain) of your container registry. |
82-
| Registry user name | Enter your user name for the registry. |
83-
| Registry password | Enter your password for the registry. |
84-
| Image and tag | Enter the image name, including tag. |
85-
::: zone-end
86-
87-
::: zone pivot="container-apps-public-registry"
88-
| Setting | Action |
89-
|---|---|
90-
| Use quickstart image | **Uncheck** the checkbox. |
91-
| Name | Enter **my-portal-app**. |
92-
| Image source | Select your container image repository source. If your container is hosted in a registry other than **Azure Container Registry**, select **Docker Hub or other registries**. |
93-
| Registry login server | Enter the domain (including subdomain) of your container registry. |
94-
| Image type | Select **Public**. |
95-
| Image and tag | Enter the image name, including tag. |
96-
::: zone-end
60+
| Subscription | Select your Azure subscription. |
61+
| Registry | Select your registry. |
62+
| Image and image tag | Enter the image name, including tag. |
63+
64+
Select **Next: Ingress**.
9765

98-
#### Application ingress settings
66+
### Ingress tab
9967

10068
| Setting | Action |
10169
|---|---|
102-
| Ingress | Select **Enabled** or **Disabled**. |
70+
| Ingress | Check or uncheck the checkbox. |
10371

104-
If you enabled ingress, configure the following settings:
72+
If you checked the box to enable ingress, configure the following settings:
10573

10674
| Setting | Action |
10775
|---|---|
108-
| Ingress visibility | Select **Internal** to only allow ingress from other apps in the same virtual network, and select **External** to publicly expose your container app. |
76+
| Ingress traffic | Select **Limited to Container App Environment** to restrict traffic to this container app. Select **Accepting traffic from anywhere** to publicly expose your container app. |
10977
| Target port | Enter the port you want to expose your container app. |
11078

11179
### Deploy the container app
11280

113-
1. Select the **Review and create** button at the bottom of the page.
81+
1. Select the **Review and create** button.
11482

115-
Next, the settings in the Container App are verified. If no errors are found, the *Create* button is enabled.
83+
If no errors are found, the **Create** button is enabled.
11684

117-
If there are errors, any tab containing errors is marked with a red dot. Navigate to the appropriate tab. Fields containing an error is highlighted in red. Once all errors are fixed, select **Review and create** again.
85+
If there are errors, any tab containing errors is marked with a red dot. Navigate to the appropriate tab. Fields containing an error are highlighted in red. Once all errors are fixed, select **Review and create** again.
11886

11987
1. Select **Create**.
12088

121-
A page with the message *Deployment is in progress* is displayed. Once the deployment is successfully completed, you see the message: *Your deployment is complete*.
89+
A page with the message **Deployment is in progress** is displayed. Once the deployment is successfully completed, you see the message: **Your deployment is complete**.
12290

12391
### Verify deployment
12492

125-
You can verify your deployment is successful by querying the Log Analytics workspace. You might need to wait a 5 to 10 minutes for the analytics to arrive for the first time before you're able to query the logs.
126-
127-
After 5 to 10 minutes of creating the container app, follow these steps to view logged messages:
93+
You can verify your deployment is successful by querying the Log Analytics workspace. You might need to wait 5 to 10 minutes for the analytics to arrive for the first time before you're able to query the logs.
12894

12995
1. Select **Go to resource** to view your new container app.
130-
1. Select **Logs** under the *Monitoring* header.
131-
1. Select the **Load to editor** button from any of the cards.
132-
1. Replace the generated code with the following query:
96+
97+
1. Under **Monitoring**, select **Logs**.
98+
99+
1. Select **KQL mode** from the menu bar.
100+
101+
1. Enter the following query:
133102

134103
```text
135104
ContainerAppConsoleLogs_CL | where ContainerAppName_s == 'my-container-app' | project ContainerAppName_s, Log_s, TimeGenerated
136105
```
137106
138107
1. Select the **Run** button.
108+
139109
1. Inspect the results in the table.
140110
141111
## Clean up resources
142112
143113
If you're not going to continue to use this application, you can delete the Azure Container Apps instance and all the associated services by removing the resource group.
144114
145-
1. Select the **my-container-apps** resource group from the *Overview* section.
146-
1. Select the **Delete resource group** button at the top of the resource group *Overview*.
147-
1. Enter the resource group name **my-container-apps** in the *Are you sure you want to delete "my-container-apps"* confirmation dialog.
148-
1. Select **Delete**.
149-
The process to delete the resource group might take a few minutes to complete.
115+
1. Select your resource group from the **Overview** section, then select the **Delete resource group** button.
116+
117+
1. Confirm the resource group name, and then select **Delete**. The process to delete the resource group might take a few minutes to complete.
150118
151119
> [!TIP]
152120
> Having issues? Let us know on GitHub by opening an issue in the [Azure Container Apps repo](https://github.com/microsoft/azure-container-apps).
153121
154-
## Next steps
122+
## Next step
155123
156124
> [!div class="nextstepaction"]
157125
> [Communication between microservices](communicate-between-microservices.md)

articles/container-apps/manage-secrets.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Azure Container Apps allows your application to securely store sensitive configu
2121
- Secrets are scoped to an application, outside of any specific revision of an application.
2222
- New revisions don't get generated through adding, removing, or changing secrets.
2323
- Each application revision can reference one or more secrets.
24-
- Multiple revisions can reference the same secret(s).
24+
- Multiple revisions can reference the same secrets.
2525

2626
An updated or deleted secret doesn't automatically affect existing revisions in your app. When a secret is updated or deleted, you can respond to changes in one of two ways:
2727

@@ -39,13 +39,13 @@ Secrets are defined as a set of name/value pairs. The value of each secret is sp
3939
4040
### Store secret value in Container Apps
4141

42-
When you define secrets through the portal, or via different command line options.
42+
The following is used when you define secrets through the portal, or via different command line options.
4343

4444
# [Azure portal](#tab/azure-portal)
4545

4646
1. Go to your container app in the [Azure portal](https://portal.azure.com).
4747

48-
1. Under the *Settings* section, select **Secrets**.
48+
1. Under the *Security* section, select **Secrets**.
4949

5050
1. Select **Add**.
5151

@@ -122,7 +122,7 @@ Here, a connection string to a queue storage account is declared. The value for
122122

123123
---
124124

125-
### <a name="reference-secret-from-key-vault"></a>Reference secret from Key Vault
125+
## <a name="reference-secret-from-key-vault"></a>Reference secret from Key Vault
126126

127127
When you define a secret, you create a reference to a secret stored in Azure Key Vault. Container Apps automatically retrieves the secret value from Key Vault and makes it available as a secret in your container app.
128128

@@ -136,7 +136,7 @@ To grant access to Key Vault secrets, grant the Azure RBAC role [Key Vault Secre
136136

137137
1. Go to your container app in the [Azure portal](https://portal.azure.com).
138138

139-
1. Under the *Settings* section, select **Identity**.
139+
1. Under the *Security* section, select **Identity**.
140140

141141
1. In the *System assigned* tab, set the *Status* to **On**.
142142

@@ -147,7 +147,7 @@ To grant access to Key Vault secrets, grant the Azure RBAC role [Key Vault Secre
147147

148148
1. A popup appears to confirm that you want to enable system assigned managed identity and register your container app with Microsoft Entra ID. Select **Yes**.
149149

150-
1. Under the *Settings* section, select **Secrets**.
150+
1. Under the *Security* section, select **Secrets**.
151151

152152
1. Select **Add**.
153153

@@ -216,14 +216,14 @@ Secrets Key Vault references aren't supported in PowerShell.
216216
---
217217

218218
> [!NOTE]
219-
> If you're using [UDR With Azure Firewall](user-defined-routes.md), you will need to add the `AzureKeyVault` service tag and the *login.microsoft.com* FQDN to the allow list for your firewall. Refer to [configuring UDR with Azure Firewall](use-azure-firewall.md) to decide which additional service tags you need.
219+
> If you're using [UDR With Azure Firewall](user-defined-routes.md), you'll need to add the `AzureKeyVault` service tag and the *login.microsoft.com* FQDN to the allow list for your firewall. Refer to [configuring UDR with Azure Firewall](use-azure-firewall.md) to decide which additional service tags you need.
220220
221221
#### Key Vault secret URI and secret rotation
222222

223223
The Key Vault secret URI must be in one of the following formats:
224224

225-
* `https://myvault.vault.azure.net/secrets/mysecret/ec96f02080254f109c51a1f14cdb1931`: Reference a specific version of a secret.
226-
* `https://myvault.vault.azure.net/secrets/mysecret`: Reference the latest version of a secret.
225+
- `https://myvault.vault.azure.net/secrets/mysecret/ec96f02080254f109c51a1f14cdb1931`: Reference a specific version of a secret.
226+
- `https://myvault.vault.azure.net/secrets/mysecret`: Reference the latest version of a secret.
227227

228228
If a version isn't specified in the URI, then the app uses the latest version that exists in the key vault. When newer versions become available, the app automatically retrieves the latest version within 30 minutes. Any active revisions that reference the secret in an environment variable is automatically restarted to pick up the new value.
229229

articles/container-apps/overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.topic: overview
8-
ms.date: 11/19/2024
8+
ms.date: 03/31/2026
99
ms.author: cshoe
1010
ms.custom: build-2023
1111
---
@@ -26,7 +26,7 @@ Additionally, applications built on Azure Container Apps can dynamically scale b
2626
- HTTP traffic
2727
- Event-driven processing
2828
- CPU or memory load
29-
- Any [KEDA-supported scaler](https://keda.sh/docs/scalers/)
29+
- Any [KEDA-supported scaler](https://keda.sh/docs/2.19/scalers/)
3030

3131
:::image type="content" source="media/overview/azure-container-apps-example-scenarios.png" alt-text="Example scenarios for Azure Container Apps.":::
3232

@@ -43,13 +43,13 @@ With Azure Container Apps, you can:
4343

4444
- [**Use the Azure CLI extension, Azure portal or ARM templates**](get-started.md) to manage your applications.
4545

46-
- [**Enable HTTPS or TCP ingress**](ingress.md) without having to manage other Azure infrastructure.
46+
- [**Enable HTTPS or TCP ingress**](ingress-overview.md) without having to manage other Azure infrastructure.
4747

4848
- [**Build microservices with Dapr**](microservices.md) and [access its rich set of APIs](./dapr-overview.md).
4949

5050
- [**Run jobs**](jobs.md) on-demand, on a schedule, or based on events.
5151

52-
- [**Run Azure Functions**](../container-apps/functions-overview.md) for [event-driven scenarios](../azure-functions/functions-scenarios.md) using triggers, bindings and automatic scaling.
52+
- [**Run Azure Functions**](../container-apps/functions-overview.md) for [event-driven scenarios](../azure-functions/functions-scenarios.md) using triggers, bindings, and automatic scaling.
5353

5454
- Add [**Azure Spring Apps**](https://aka.ms/asaonaca) to your Azure Container Apps environment.
5555

0 commit comments

Comments
 (0)