Skip to content

Commit a3e0534

Browse files
author
gitName
committed
Further edits
1 parent 9e14e3b commit a3e0534

6 files changed

+14
-14
lines changed

learn-pr/azure/intro-to-containers/includes/3-exercise-deploy-docker-image-locally.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ In this exercise, you'll pull an image from Docker Hub and run it. You'll examin
3333
docker run -d -p 8080:8080 mcr.microsoft.com/dotnet/samples:aspnetapp
3434
```
3535
36-
1. Open a web browser and enter the URL for the sample web app: `http://localhost:8080`. You should see a page that looks like the following screenshot:
36+
1. Open a web browser and go to the URL for the sample web app: `http://localhost:8080`. You should get a page that looks like the following screenshot:
3737
3838
:::image type="content" source="../media/3-sample-web-app.png" alt-text="Screenshot of the sample web app running in a browser." loc-scope="other"::: <!--no-loc -->
3939

learn-pr/azure/intro-to-containers/includes/4-create-custom-docker-image.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ In this unit, you'll learn how to create a custom Docker image and how you can a
88

99
To create a Docker image containing your application, you typically begin by identifying a *base image*, to which you add files and configuration information. The process of identifying a suitable base image usually starts with an image search on Docker Hub. You want an image that already contains an application framework and all the utilities and tools of a Linux distribution, like Ubuntu or Alpine. For example, if you have an ASP.NET Core application that you want to package into a container, Microsoft publishes an image called `mcr.microsoft.com/dotnet/core/aspnet` that already contains the ASP.NET Core runtime.
1010

11-
You can customize an image by starting a container with the base image and making changes to it. Changes usually involve activities such as copying files into the container from the local filesystem and running various tools and utilities to compile code. When you're finished, you use the `docker commit` command to save the changes to a new image.
11+
You can customize an image by starting a container with the base image and making changes to it. Changes usually involve activities such as copying files into the container from the local filesystem and running various tools and utilities to compile code. When you're finished, you can use the `docker commit` command to save the changes to a new image.
1212

1313
Manually completing the above process is time consuming and error prone. You could script it with a script language like Bash, but Docker provides a more effective way of automating image creation via a *Dockerfile*.
1414

@@ -41,9 +41,9 @@ By convention, applications meant to be packaged as Docker images typically have
4141

4242
The `docker build` command creates a new image by running a Dockerfile. This command's syntax has several parameters:
4343

44-
- The *-f* flag indicates the name of the Dockerfile to use.
45-
- The *-t* flag specifies the name of the image to be created; in this example, *myapp:v1*.
46-
- The final parameter, *.*, provides the *build context* for the source files for the **COPY** command: the set of files on the host computer needed during the build process.
44+
- The `-f` flag indicates the name of the Dockerfile to use.
45+
- The `-t` flag specifies the name of the image to be created; in this example, *myapp:v1*.
46+
- The final parameter, `.`, provides the *build context* for the source files for the **COPY** command: the set of files on the host computer needed during the build process.
4747

4848
```bash
4949
docker build -t myapp:v1 .

learn-pr/azure/intro-to-containers/includes/5-exercise-create-custom-docker-image.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ In this exercise, you'll create a Dockerfile for an app that doesn't have one. T
104104
docker run -p 8080:80 -d --name reservations reservationsystem
105105
```
106106

107-
1. Start a web browser and navigate to `http://localhost:8080/api/reservations/1`. You should see a JSON object containing the data for reservation number 1 similar to the following output:
107+
1. Start a web browser and navigate to `http://localhost:8080/api/reservations/1`. You should get a JSON object containing the data for reservation number 1 similar to the following output:
108108

109109
:::image type="content" source="../media/5-hotel-web-app.png" alt-text="Screenshot of the hotel reservations system web app running in a browser.":::
110110

learn-pr/azure/intro-to-containers/includes/6-deploy-docker-image-to-container-instance.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ az group create --name mygroup --location westus
2323
az acr create --name <unique name> --resource-group mygroup --sku standard --admin-enabled true
2424
```
2525

26-
Different SKUs provide varying levels of scalability and storage.
26+
Different SKUs provide varying scalability and storage levels.
2727

2828
Azure Container Registry repositories are private, meaning they don't support unauthenticated access. To pull images from an Azure Container Registry repository, use the `docker login` command and specify the URL of the login server for the registry. The login server URL for a registry in Azure Container Registry has the form \<*registry_name*\>.azurecr.io.
2929

@@ -37,13 +37,13 @@ Docker login will prompt you for a username and password. To find this informati
3737
az acr credential show --name myregistry --resource-group mygroup
3838
```
3939

40-
You *push* an image from your local computer to a Docker registry by using the `docker push` command. Before you push an image, you must create an alias for the image that specifies the repository and tag that the Docker registry creates. The repository name must be of the form \*<login_server\>/<*image_name*\>:<*tag*/>. Use the `docker tag` command to perform this operation. The following example creates an alias for the *reservationsystem* image.
40+
You can *push* an image from your local computer to a Docker registry by using the `docker push` command. Before you push an image, you must create an alias for the image that specifies the repository and tag that the Docker registry creates. The repository name must be of the form \*<login_server\>/<*image_name*\>:<*tag*/>. Use the `docker tag` command to perform this operation. The following example creates an alias for the *reservationsystem* image.
4141

4242
```bash
4343
docker tag reservationsystem myregistry.azurecr.io/reservationsystem:v2
4444
```
4545

46-
If you run `docker image ls`, you'll see two entries for the image: one with the original name and the second with the new alias.
46+
If you run `docker image ls`, you'll get two entries for the image: one with the original name and the second with the new alias.
4747

4848
After you run the tag command, you can upload the image to the registry in Azure Container Registry using the following command.
4949

@@ -70,7 +70,7 @@ az acr repository show --repository reservationsystem --name myregistry --resour
7070

7171
The Azure Container Instance service can load an image from Azure Container Registry and run it in Azure.
7272

73-
You create a container instance and start the image running by using the `az container create` command. Provide the username and password for the registry in the `registry-username` and `registry-password` parameters. The instance will be allocated an IP address. You access the instance with this IP address. You can optionally specify a DNS name if you prefer to reference the instance through a more user-friendly label. Notice that you specify the image as a URL that references your registry (*myregistry*) in the Azure Container Registry service (*azurecr.io*). If you're using Docker Hub or some other registry, replace this URL with the URL of your image in that registry.
73+
You can create a container instance and start the image running by using the `az container create` command. Provide the username and password for the registry in the `registry-username` and `registry-password` parameters. The instance will be allocated an IP address. You access the instance with this IP address. You can optionally specify a DNS name if you prefer to reference the instance through a more user-friendly label. Notice that you specify the image as a URL that references your registry (*myregistry*) in the Azure Container Registry service (*azurecr.io*). If you're using Docker Hub or some other registry, replace this URL with the URL of your image in that registry.
7474

7575
```azurecli
7676
az container create --resource-group mygroup --name myinstance --image myregistry.azurecr.io/myapp:latest --dns-name-label mydnsname --registry-username <username> --registry-password <password>

learn-pr/azure/intro-to-containers/includes/7-exercise-deploy-docker-image-to-container-instance.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ In this exercise, you'll learn how to rebuild the image for the web app and uplo
1212

1313
1. On the resource menu or from the **Home** page, select **Create a resource**. The **Create a resource** pane appears.
1414

15-
1. In the menu, search for and select **Container Registry**.
15+
1. In the menu, search for **Container Registry**. In the Container Registry search result, select **Create** > **Container Registry**.
1616

1717
:::image type="content" source="../media/7-search-container-registry.png" alt-text="Screenshot that shows Create a resource with Container Registry.":::
1818

@@ -83,7 +83,7 @@ In this exercise, you'll learn how to rebuild the image for the web app and uplo
8383
docker push <registry-name>.azurecr.io/reservationsystem:latest
8484
```
8585
86-
Wait until the upload completes. This process will take several minutes to push all the objects of the image to your repository. You can observe the progress as each object advances from *Waiting* to *Preparing* to *Pushing* to *Pushed*.
86+
Wait until the upload completes. This process takes several minutes to push all the objects of the image to your repository. You can observe the progress as each object advances from *Waiting* to *Preparing* to *Pushing* to *Pushed*.
8787
8888
## Verify the registry contents
8989
@@ -101,7 +101,7 @@ For the remainder of the exercise, you'll return to the Azure portal.
101101

102102
1. In the Azure portal, select **Create a resource**. The **Create a resource** pane appears.
103103

104-
1. In the resource menu, select **Containers**, and then select **Container Instances**.
104+
1. In the resource menu, select **Containers**, and then select **Create** > **Container Instances** in the **Container Instances** search item.
105105

106106
:::image type="content" source="../media/7-search-container-instance.png" alt-text="Screenshot showing Container Instances.":::
107107

learn-pr/azure/intro-to-containers/includes/8-summary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ In this module, you created resources by using your Azure subscription. You want
1414

1515
## Learn More
1616

17-
- [Docker overview](https://docs.docker.com/guides/docker-overview/)
17+
- [Docker overview](https://docs.docker.com/get-started/docker-overview/)
1818
- [Install Docker Desktop on Windows](https://docs.docker.com/desktop/install/windows-install/)
1919
- [Docker reference documentation](https://docs.docker.com/reference/)
2020
- [Best practices for writing Dockerfiles](https://docs.docker.com/build/building/best-practices/)

0 commit comments

Comments
 (0)