Skip to content

Commit bc3b195

Browse files
committed
acrolynx updates
1 parent 7193e07 commit bc3b195

11 files changed

+36
-36
lines changed

articles/app-service/containers/tutorial-javascript-vscode-containerize-app.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,35 @@ ms.devlang: javascript
1212

1313
Next, use the Docker extension to add the necessary files to create an image for your app, build the image, and push it to a registry.
1414

15-
> **Tip:** If you don't already have an app for this walkthrough, follow the [Node.js tutorial](/docs/nodejs/nodejs-tutorial.md).
15+
> **Tip:** If you don't already have an app for this quickstart, follow the [Node.js tutorial](/docs/nodejs/nodejs-tutorial.md).
1616
1717
## Add Docker files
1818

1919
Open the **Command Palette** (CTRL + SHIFT + P) and type `add docker files to workspace` to run the **Docker: Add Docker files to workspace** command. This command will create the necessary Docker files. Choose your application type - **Node.js** in this tutorial - along with the port that your application listens on.
2020

2121
> **Tip:** Be sure that the port you select matches the port your app listens on. If you used the Express generator, set this to 3000.
2222
23-
This will add a `Dockerfile` along with some configuration files for Docker compose and a `.dockerignore`.
23+
This action will add a `Dockerfile` along with some configuration files for Docker compose and a `.dockerignore`.
2424

2525
> **Tip**: VS Code has great support for Docker files. See the [Working with Docker](/docs/azure/docker.md) topic to learn about rich language features like smart suggestions, completions, and error detection.
2626
2727
## Build a Docker image
2828

29-
The files you just added, specifically, `Dockerfile`, describe the environment for your app including the location of the source files and the command to start the app within a container.
29+
The `Dockerfile` file describes the environment for your app including the location of the source files and the command to start the app within a container.
3030

3131
> **Tip:** Containers versus images: A container is an instance of an image.
3232
33-
Open the **Command Palette** (CTRL + SHIFT + P) and run **Docker: Build Image** to build the image. Choose the `Dockerfile` that was just created then give the image a name. It's important that you specify a couple of things here, the format is as follows:
33+
Open the **Command Palette** (CTRL + SHIFT + P) and run **Docker: Build Image** to build the image. Choose the `Dockerfile` file then give the image a name. It's important that you specify a couple of things here. The format is as follows:
3434

3535
`[registry or username]/[image name]:[tag]`
3636

37-
This tutorial uses the Azure Container Registry so for my example:
37+
This quickstart uses the Azure Container Registry so for my example:
3838

3939
`fiveisprime.azurecr.io/myexpressapp:latest`
4040

4141
![tag docker image](./media/tutorial-javascript-vscode/tag-image.png)
4242

43-
If you are using Docker Hub, use your Docker Hub username, for example:
43+
If you're using Docker Hub, use your Docker Hub username, for example:
4444

4545
`fiveisprime/myexpressapp:latest`
4646

articles/app-service/containers/tutorial-javascript-vscode-create-registry.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ ms.devlang: javascript
1010
---
1111
# Using Container Registries
1212

13-
You need a container registry to push your app image to once the image is built. Once your image is available in a container registry, you will deploy directly from that registry.
13+
You need a container registry to push your app image to once the image is built. Once your image is available in a container registry, you'll deploy directly from that registry.
1414

1515
## Using Azure Container Registry
1616

17-
[Azure Container Registry](https://azure.microsoft.com/en-us/services/container-registry/) (ACR) is a private, secure, hosted registry for your images. ACR is used in this tutorial, however ACR uses all the same tools and processes as other registry options so the steps are consistent regardless.
17+
[Azure Container Registry](https://azure.microsoft.com/en-us/services/container-registry/) (ACR) is a private, secure, hosted registry for your images. ACR is used in this tutorial, but the steps are the same for other registry services.
1818

1919
Create an Azure Container Registry by signing in to the [Azure portal](https://portal.azure.com) then selecting **Create a resource** > **Containers** > **Container Registry**.
2020

2121
![Dashboard](./media/tutorial-javascript-vscode/qs-portal-01.png)
2222

23-
Enter values for **Registry name** and **Resource group**. The registry name must be unique within Azure and contain 5-50 alphanumeric characters. For this tutorial select **'Basic'** for the **SKU**. Select **Create** to deploy the ACR instance.
23+
Enter values for **Registry name** and **Resource group**. The registry name must be unique within Azure and contain 5-50 alphanumeric characters. For this quickstart, select **'Basic'** for the **SKU**. Select **Create** to deploy the ACR instance.
2424

2525
![Creation](./media/tutorial-javascript-vscode/qs-portal-03.png)
2626

@@ -39,7 +39,7 @@ Login Succeeded
3939

4040
## Using Docker Hub
4141

42-
Docker Hub is Docker's own hosted registry that provides a free way of sharing images. Sign up for a Docker ID on [Docker Hub](https://hub.docker.com/) then login to the Docker CLI using your Docker ID credentials.
42+
Docker Hub is Docker's own hosted registry that provides a free way of sharing images. Sign up for a Docker ID on [Docker Hub](https://hub.docker.com/), then sign in to the Docker CLI using your Docker ID credentials.
4343

4444
## Prerequisite Check
4545

articles/app-service/containers/tutorial-javascript-vscode-deploy-container.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ Now that you have your app image built and pushed to a registry, you can deploy
1414

1515
## Deploy the image
1616

17-
Find the image under the **Registries** node in the **DOCKER** explorer, right click the `:latest` tag and choose **Deploy Image to Azure App Service**.
17+
Find the image under the **Registries** node in the **DOCKER** explorer, right-click the `:latest` tag, and choose **Deploy Image to Azure App Service**.
1818

1919
![Deploy From the Explorer](./media/tutorial-javascript-vscode/deploy-menu.png)
2020

21-
From here follow the prompts. Set up a Resource Group in `West US` and App Service Plan. For this tutorial, use 'myResourceGroup' and 'myPlan' for the Resource Group and plan names then give your app a **unique** name.
21+
From here, follow the prompts. Set up a Resource Group in `West US` and App Service Plan. For this quickstart, use 'myResourceGroup' and 'myPlan' for the Resource Group and plan names then give your app a **unique** name.
2222

2323
Once created, your app is accessible via http://**unique-name**.azurewebsites.net. In this example, I called it `myExpressApp4321`.
2424

2525
![Create and Deploy](./media/tutorial-javascript-vscode/create.gif)
2626

2727
A **Resource Group** is essentially a named collection of all our application's resources in Azure. For example, a Resource Group can contain a reference to a website, a database, and an Azure Function.
2828

29-
An **App Service Plan** defines the physical resources that will be used to host our website. In this walkthrough, we will use a **Basic** hosting plan on **Linux** infrastructure, which means the site will be hosted on a Linux machine alongside other websites. You can scale up and be the only site running on a machine later in the Azure Portal.
29+
An **App Service Plan** defines the physical resources that will be used to host our website. In this quickstart, we'll use a **Basic** hosting plan on **Linux** infrastructure, which means the site will be hosted on a Linux machine alongside other websites. You can scale up and be the only site running on a machine later in the Azure portal.
3030

3131
## Browse the website
3232

33-
The Output panel will open during deployment to indicate the status of the operation. Once completed, find the app that you just created in the **AZURE APP SERVICE** explorer, right-click, and choose **Browse Website** to open the site in your browser.
33+
The **Output** panel will open during deployment to indicate the status of the operation. When the operation completes, find the app you created in the **AZURE APP SERVICE** explorer, right-click it, then choose **Browse Website** to open the site in your browser.
3434

3535
----
3636

articles/app-service/containers/tutorial-javascript-vscode-get-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.devlang: javascript
1010
---
1111
# Deploy to Azure using Docker
1212

13-
This tutorial walks you through containerizing an existing Node.js application using [Docker](https://www.docker.com/), pushing the app image to a Docker registry, then deploying the image to [Azure Web App for Containers](https://azure.microsoft.com/en-us/services/app-service/containers/) directly from Visual Studio Code.
13+
This quickstart shows you how to containerize an existing Node.js application using [Docker](https://www.docker.com/), then use Visual Studio Code to push the app image to a Docker registry and deploy it to [Azure Web App for Containers](https://azure.microsoft.com/en-us/services/app-service/containers/).
1414

1515
## Prerequisites
1616

@@ -20,7 +20,7 @@ You need [Visual Studio Code](https://code.visualstudio.com/) installed along wi
2020

2121
## Install the Docker and Azure App Service extensions
2222

23-
The Docker extension is used to simplify the management of local Docker images and commands as well as the deployment of a built app image to Azure.
23+
The Docker extension is used to simplify the management of local Docker images and commands and to deploy built app images to Azure.
2424

2525
> <a class="tutorial-install-extension-btn" href="vscode:extension/PeterJausovec.vscode-docker">Install the Docker extension</a>
2626

articles/app-service/containers/tutorial-javascript-vscode-tail-logs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ When prompted, choose to enable logging and restart the application. Once the ap
2020

2121
![Enable Logging and Restart](./media/tutorial-javascript-vscode/enable-restart.png)
2222

23-
After a few seconds, you will see a message indicating that you are connected to the log-streaming service.
23+
After a few seconds, you'll see a message indicating that you're connected to the log-streaming service.
2424

2525
```bash
2626
Connecting to log-streaming service...
@@ -39,7 +39,7 @@ Refresh the page a few times in the browser to see log output.
3939

4040
## Congratulations!
4141

42-
Congratulations, you've successfully completed this walkthrough!
42+
Congratulations, you've successfully completed this quickstart!
4343

4444
## Other Azure extensions
4545

@@ -48,7 +48,7 @@ Next, check out the other Azure extensions.
4848
* [Cosmos DB](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-cosmosdb)
4949
* [Azure Functions](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions)
5050
* [Azure CLI Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azurecli)
51-
* [Azure Resource Manager (ARM) Tools](https://marketplace.visualstudio.com/items?itemName=msazurermtools.azurerm-vscode-tools)
51+
* [Azure Resource Manager Tools](https://marketplace.visualstudio.com/items?itemName=msazurermtools.azurerm-vscode-tools)
5252

5353
Or get them all by installing the
5454
[Node Pack for Azure](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-node-azure-pack) extension pack.

articles/app-service/tutorial-javascript-vscode-create-app.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ ms.devlang: javascript
1010
---
1111
# Create your Node.js application
1212

13-
Next, create a simple Node.js application that can be deployed to the Cloud. This tutorial uses an application generator to quickly scaffold out the application from a terminal.
13+
Next, create a Node.js application that can be deployed to the Cloud. This tutorial uses an application generator to quickly scaffold out the application from a terminal.
1414

1515
> **Tip:** If you have already completed the [Node.js tutorial](/docs/nodejs/nodejs-tutorial.md), you can skip ahead to [Deploy the Website](/tutorials/app-service-extension/deploy-app.md).
1616
1717
## Install the Express generator
1818

19-
[Express](https://www.expressjs.com) is an extremely popular framework for building and running Node.js applications. You can scaffold (create) a new
20-
Express application using the [Express Generator](https://expressjs.com/en/starter/generator.html) tool. The Express Generator is shipped as an npm module and installed by using the npm command line tool `npm`.
19+
[Express](https://www.expressjs.com) is a popular framework for building and running Node.js applications. You can scaffold (create) a new
20+
Express application using the [Express Generator](https://expressjs.com/en/starter/generator.html) tool. The Express Generator is shipped as an npm module and installed by using the npm command-line tool `npm`.
2121

2222
```bash
2323
$ npm install -g express-generator

articles/app-service/tutorial-javascript-vscode-get-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.devlang: javascript
1010
---
1111
# Deploy to Azure using App Service
1212

13-
This tutorial walks you through deploying a Node.js application to Azure using the [Azure App Service extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azureappservice). You'll be able to deploy to Azure on Linux in a matter of minutes from Visual Studio Code.
13+
This tutorial walks you through deploying a Node.js application to Azure using the [Azure App Service extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azureappservice). You can deploy to Azure on Linux in a matter of minutes from Visual Studio Code.
1414

1515
## Prerequisites
1616

@@ -32,7 +32,7 @@ Once the extension is installed, log into your Azure account - in the Activity B
3232

3333
## Troubleshooting
3434

35-
If you see the error **"Cannot find subscription with name [subscription ID]"**, this may be because you are behind a proxy and unable to reach the Azure API. Configure `HTTP_PROXY` and `HTTPS_PROXY` environment variables with your proxy information in your terminal using `export`.
35+
If you see the error **"Cannot find subscription with name [subscription ID]"**, it might be because you're behind a proxy and unable to reach the Azure API. Configure `HTTP_PROXY` and `HTTPS_PROXY` environment variables with your proxy information in your terminal using `export`.
3636

3737
```sh
3838
export HTTPS_PROXY=https://username:password@proxy:8080

articles/app-service/tutorial-javascript-vscode-tail-logs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ When prompted, choose to enable logging and restart the application. Once the ap
2020

2121
![Enable Logging and Restart](./media/tutorial-javascript-vscode/enable-restart.png)
2222

23-
After a few seconds, you will see a message indicating that you are connected to the log-streaming service.
23+
After a few seconds, you'll see a message indicating that you're connected to the log-streaming service.
2424

2525
```bash
2626
Connecting to log-streaming service...
@@ -39,7 +39,7 @@ Refresh the page a few times in the browser to see log output.
3939

4040
## Congratulations!
4141

42-
Congratulations, you've successfully completed this walkthrough!
42+
Congratulations, you've successfully completed this quickstart!
4343

4444
## Other Azure extensions
4545

@@ -49,7 +49,7 @@ Next, check out the other Azure extensions.
4949
* [Azure Functions](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions)
5050
* [Docker Tools](https://marketplace.visualstudio.com/items?itemName=PeterJausovec.vscode-docker)
5151
* [Azure CLI Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azurecli)
52-
* [Azure Resource Manager (ARM) Tools](https://marketplace.visualstudio.com/items?itemName=msazurermtools.azurerm-vscode-tools)
52+
* [Azure Resource Manager Tools](https://marketplace.visualstudio.com/items?itemName=msazurermtools.azurerm-vscode-tools)
5353

5454
Or get them all by installing the
5555
[Node Pack for Azure](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-node-azure-pack) extension pack.

articles/azure-functions/tutorial-javascript-vscode-deploy-app.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.devlang: javascript
1212

1313
If you don't have an Azure account, [sign up today](https://azure.microsoft.com/en-us/free/serverless?utm_source=campaign&utm_campaign=vscode-tutorial-functions-extension&mktingSource=vscode-tutorial-functions-extension) for a free account with $200 in Azure credits to try out any combination of services.
1414

15-
Once created, log in to your Azure account - in the Activity Bar, click on the Azure logo to show the **Azure Functions** explorer. Click **Sign in to Azure...** and choose your account in the browser.
15+
Once created, sign in to your Azure account - in the Activity Bar, click on the Azure logo to show the **Azure Functions** explorer. Click **Sign in to Azure...** and choose your account in the browser.
1616

1717
![sign in to Azure](./media/tutorial-javascript-vscode/sign-in.png)
1818

@@ -22,7 +22,7 @@ In the **AZURE FUNCTIONS** explorer, click the blue up arrow icon to deploy your
2222

2323
> **Tip:** You can also deploy from the **Command Palette** (CTRL + SHIFT + P) by typing 'deploy to function app' and running the **Azure Functions: Deploy to Function App** command.
2424
25-
From here follow the prompts. Choose the directory that you currently have open, select your Azure subscription, and then choose **Create New Function App**.
25+
From here, follow the prompts. Choose the directory that you currently have open, select your Azure subscription, and then choose **Create New Function App**.
2626

2727
1. Type a globally unique name for your Function App and press ENTER. Valid characters for a function app name are 'a-z', '0-9', and '-'.
2828

@@ -42,27 +42,27 @@ The Output panel shows the Azure resources that were created in your subscriptio
4242

4343
## Browse the website
4444

45-
The Output panel will open during deployment to indicate the status of the operation. Once completed, find the app that you just created in the **AZURE FUNCTIONS** explorer, expand the **Functions** node to expose the HttpTriggerJS function, then right-click and choose **Copy Function Url**. Paste the URL into your browser along add the `?name=Matt` query parameter and press ENTER to see the response.
45+
The **Output** panel will open during deployment to indicate the status of the operation. When the operation completes, find the app you created in the **AZURE FUNCTIONS** explorer. Then, expand the **Functions** node to expose the HttpTriggerJS function, right-click it, and choose **Copy Function Url**. Paste the URL into your browser along add the `?name=Matt` query parameter and press ENTER to see the response.
4646

4747
![Deploy to Functions](./media/tutorial-javascript-vscode/functions-test-remote-browser.png)
4848

4949
## Updating the App
5050

51-
Next, make some changes to your Function and add new Functions with other Triggers. Once you have all the source code running correctly in your local environment, click the blue up arrow **Deploy to Function App** button to deploy your changes.
51+
Next, make some changes to your Function and add new Functions with other Triggers. When you have the code running correctly in your local environment, click the blue up arrow **Deploy to Function App** button to deploy your changes.
5252

5353
> **Tip:** When deploying, the entire Functions application is deploy so changes to all individual Functions will be deployed at once.
5454
5555
## Congratulations!
5656

57-
Congratulations, you've successfully completed this walkthrough!
57+
Congratulations, you've successfully completed this quickstart!
5858

5959
Next, check out the other Azure extensions.
6060

6161
* [Azure App Service](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azureappservice)
6262
* [Cosmos DB](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-cosmosdb)
6363
* [Docker Tools](https://marketplace.visualstudio.com/items?itemName=PeterJausovec.vscode-docker)
6464
* [Azure CLI Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.azurecli)
65-
* [Azure Resource Manager (ARM) Tools](https://marketplace.visualstudio.com/items?itemName=msazurermtools.azurerm-vscode-tools)
65+
* [Azure Resource Manager Tools](https://marketplace.visualstudio.com/items?itemName=msazurermtools.azurerm-vscode-tools)
6666

6767
Or get them all by installing the
6868
[Node Pack for Azure](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-node-azure-pack) extension pack.

articles/azure-functions/tutorial-javascript-vscode-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.devlang: javascript
1010
---
1111
# Deploy to Azure using Azure Functions
1212

13-
This tutorial walks you through creating and deploying a JavaScript Azure Functions application using the [Azure Functions extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions). Create a new app, add functions and deploy in a matter of minutes from Visual Studio Code.
13+
This tutorial walks you through creating and deploying a JavaScript Azure Functions application using the [Azure Functions extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azurefunctions). Create a new app, add functions, and deploy in a matter of minutes from Visual Studio Code.
1414

1515
## Prerequisites
1616

0 commit comments

Comments
 (0)