Skip to content

Commit a38cf5a

Browse files
authored
Merge pull request #190804 from v-niranjan/nr-100222-phpwebapp-1906169
Updated as per user story 1906169
2 parents 77a8317 + 2af5697 commit a38cf5a

11 files changed

+27
-26
lines changed
101 KB
Loading
-18.2 KB
Loading
22.4 KB
Loading
-24.8 KB
Loading
65.5 KB
Loading
-5.55 KB
Loading
120 KB
Loading
-25 KB
Loading

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ author: msangapu-msft
55
ms.author: msangapu
66
ms.assetid: 582bb3c2-164b-42f5-b081-95bfcb7a502a
77
ms.topic: quickstart
8-
ms.date: 10/16/2020
9-
ms.custom: subject-armqs, mode-arm
8+
ms.date: 03/10/2022
9+
ms.custom: subject-armqs, mode-arm, devdivchpfy22
1010
zone_pivot_groups: app-service-platform-windows-linux
1111
adobe-target: true
1212
adobe-target-activity: DocsExp–386541–A/B–Enhanced-Readability-Quickstarts–2.19.2021
@@ -16,7 +16,7 @@ adobe-target-content: ./quickstart-arm-template-uiex
1616

1717
# Quickstart: Create App Service app using an ARM template
1818

19-
Get started with [Azure App Service](overview.md) by deploying a app to the cloud using an Azure Resource Manager template (ARM template) and [Azure CLI](/cli/azure/get-started-with-azure-cli) in Cloud Shell. Because you use a free App Service tier, you incur no costs to complete this quickstart.
19+
Get started with [Azure App Service](overview.md) by deploying an app to the cloud using an Azure Resource Manager template (ARM template) and [Azure CLI](/cli/azure/get-started-with-azure-cli) in Cloud Shell. Because you use a free App Service tier, you incur no costs to complete this quickstart.
2020

2121
[!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
2222

@@ -53,7 +53,7 @@ This template contains several parameters that are predefined for your convenien
5353
| webAppName | string | "webApp-**[`<uniqueString>`](../azure-resource-manager/templates/template-functions-string.md#uniquestring)**" | App name |
5454
| location | string | "[[resourceGroup().location](../azure-resource-manager/templates/template-functions-resource.md#resourcegroup)]" | App region |
5555
| sku | string | "F1" | Instance size (F1 = Free Tier) |
56-
| language | string | ".net" | Programming language stack (.net, php, node, html) |
56+
| language | string | ".net" | Programming language stack (.NET, php, node, html) |
5757
| helloWorld | boolean | False | True = Deploy "Hello World" app |
5858
| repoUrl | string | " " | External Git repo (optional) |
5959
::: zone-end

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ title: 'Quickstart: Run a custom container on App Service'
33
description: Get started with containers on Azure App Service by deploying your first custom container.
44
author: msangapu-msft
55
ms.author: msangapu
6-
ms.date: 06/30/2021
6+
ms.date: 03/11/2022
77
ms.topic: quickstart
8-
ms.custom: devx-track-csharp, mode-other
8+
ms.custom: devx-track-csharp, mode-other, devdivchpfy22
99
zone_pivot_groups: app-service-containers-windows-linux
1010
---
1111

1212
# Run a custom container in Azure
1313

1414
::: zone pivot="container-windows"
15-
[Azure App Service](overview.md) provides pre-defined application stacks on Windows like ASP.NET or Node.js, running on IIS. However, the preconfigured application stacks [lock down the operating system and prevent low-level access](operating-system-functionality.md). Custom Windows containers do not have these restrictions, and let developers fully customize the containers and give containerized applications full access to Windows functionality.
15+
[Azure App Service](overview.md) provides pre-defined application stacks on Windows like ASP.NET or Node.js, running on IIS. However, the pre-configured application stacks [lock down the operating system and prevent low-level access](operating-system-functionality.md). Custom Windows containers don't have these restrictions, and let developers fully customize the containers and give containerized applications full access to Windows functionality.
1616

1717
This quickstart shows how to deploy an ASP.NET app, in a Windows image, to [Azure Container Registry](../container-registry/container-registry-intro.md) from Visual Studio. You run the app in a custom container in Azure App Service.
1818

@@ -62,19 +62,19 @@ Create an ASP.NET web app by following these steps:
6262

6363
1. In **Solution Explorer**, right-click the **myfirstazurewebapp** project and select **Publish**.
6464

65-
1. In **Target**, select **Docker Container Registry**, and then click **Next**.
65+
1. In **Target**, select **Docker Container Registry**, and then select **Next**.
6666

6767
:::image type="content" source="./media/quickstart-custom-container/select-docker-container-registry-visual-studio-2022.png?text=Select Docker Container Registry" alt-text="Select Docker Container Registry":::
6868

69-
1. In **Specific Target**, select **Azure Container Registry**, and then click **Next**.
69+
1. In **Specific Target**, select **Azure Container Registry**, and then select **Next**.
7070

7171
:::image type="content" source="./media/quickstart-custom-container/publish-to-azure-container-registry-visual-studio-2022.png?text=Publish to Azure Container Registry" alt-text="Publish from project overview page":::
7272

7373
1. In **Publish**, make sure the correct subscription is chosen. In **Container registries** select the **+** button to create a new Azure Container Registry.
7474

7575
:::image type="content" source="./media/quickstart-custom-container/create-new-azure-container-registry.png?text=Create new Azure Container Registry" alt-text="Create new Azure Container Registry":::
7676

77-
1. In **Create new**, make sure the correct subscription is chosen. Under **Resource group**, select **New** and type *myResourceGroup* for the name, and click **OK**. Under **SKU**, select **Basic**. Under **Registry location**, select a location of the registry then select **Create**.
77+
1. In **Create new**, make sure the correct subscription is chosen. Under **Resource group**, select **New** and type *myResourceGroup* for the name, and select **OK**. Under **SKU**, select **Basic**. Under **Registry location**, select a location of the registry then select **Create**.
7878

7979
:::image type="content" source="./media/quickstart-custom-container/new-azure-container-registry-details.png?text=Azure Container Registry details" alt-text="Azure Container Registry details":::
8080

@@ -104,9 +104,10 @@ Create an ASP.NET web app by following these steps:
104104

105105
![Configure your a Web App for Containers](media/quickstart-custom-container/configure-web-app-container.png)
106106

107-
If you have a custom image elsewhere for your web application, such as in [Azure Container Registry](../container-registry/index.yml) or in any other private repository, you can configure it here.
107+
If you have a custom image elsewhere for your web application, such as in [Azure Container Registry](../container-registry/index.yml) or in any other private repository, you can configure it here. Select **Review + Create** to continue.
108108

109-
1. Select **Review and Create** and then **Create** and wait for Azure to create the required resources.
109+
1. Verify all the details and then select **Create** and wait for Azure to create the required resources.
110+
![Create your a Web App for Containers](media/quickstart-custom-container/web-app-container-create-start.png)
110111

111112
## Browse to the custom container
112113

@@ -135,7 +136,7 @@ It may take some time for the Windows container to load. To see the progress, na
135136
https://<app_name>.scm.azurewebsites.net/api/logstream
136137
```
137138

138-
The streamed logs looks like this:
139+
The streamed logs look like this:
139140

140141
```
141142
2018-07-27T12:03:11 Welcome, you are now connected to log-streaming service.
@@ -183,7 +184,7 @@ Or, check out other resources:
183184
::: zone-end
184185

185186
::: zone pivot="container-linux"
186-
App Service on Linux provides pre-defined application stacks on Linux with support for languages such as .NET, PHP, Node.js and others. You can also use a custom Docker image to run your web app on an application stack that is not already defined in Azure. This quickstart shows you how to deploy an image from an [Azure Container Registry](../container-registry/index.yml) (ACR) to App Service.
187+
App Service on Linux provides pre-defined application stacks on Linux with support for languages such as .NET, PHP, Node.js and others. You can also use a custom Docker image to run your web app on an application stack that isn't already defined in Azure. This quickstart shows you how to deploy an image from an [Azure Container Registry](../container-registry/index.yml) (ACR) to App Service.
187188

188189
## Prerequisites
189190

@@ -217,7 +218,7 @@ Create a container registry by following the instructions in [Quickstart: Create
217218

218219
## Check prerequisites
219220

220-
Verify that you have Docker installed and running. The following command will display the Docker version if it is running.
221+
Verify that you have Docker installed and running. The following command will display the Docker version if it's running.
221222

222223
```bash
223224
docker --version
@@ -298,7 +299,7 @@ In this Dockerfile, the parent image is one of the built-in Java containers of A
298299

299300
## Deploy to container registry
300301

301-
1. In the Activity Bar, click the **Docker** icon. In the **IMAGES** explorer, find the image you just built.
302+
1. In the Activity Bar, click the **Docker** icon. In the **IMAGES** explorer, find the image you built.
302303
1. Expand the image, right-click on the tag you want, and click **Push**.
303304
1. Make sure the image tag begins with `<acr-name>.azurecr.io` and press **Enter**.
304305
1. When Visual Studio Code finishes pushing the image to your container registry, click **Refresh** at the top of the **REGISTRIES** explorer and verify that the image is pushed successfully.
@@ -307,7 +308,7 @@ In this Dockerfile, the parent image is one of the built-in Java containers of A
307308

308309
## Deploy to App Service
309310

310-
1. In the **REGISTRIES** explorer, expand the image, right-click the tag, and click **Deploy image to Azure App Service**.
311+
1. In the **REGISTRIES** explorer, expand the image, right-click the tag, and select **Deploy image to Azure App Service**.
311312
1. Follow the prompts to choose a subscription, a globally unique app name, a resource group, and an App Service plan. Choose **B1 Basic** for the pricing tier, and a region near you.
312313

313314
After deployment, your app is available at `http://<app-name>.azurewebsites.net`.
@@ -318,7 +319,7 @@ An **App Service Plan** defines the physical resources that will be used to host
318319

319320
## Browse the website
320321

321-
The **Output** panel shows the status of the deployment operations. When the operation completes, click **Open Site** in the pop-up notification to open the site in your browser.
322+
The **Output** panel shows the status of the deployment operations. When the operation completes, select **Open Site** in the pop-up notification to open the site in your browser.
322323

323324
> [!div class="nextstepaction"]
324325
> [I ran into an issue](https://www.research.net/r/PWZWZ52?tutorial=quickstart-docker&step=deploy-app)

0 commit comments

Comments
 (0)