Merge pull request #33979 from wwlpublish/0c7dc9a213245335bac4231fc12cfe38-live

v-ccolin · web-flow · commit 2fc76b1858be · 2023-04-25T08:37:51.000+01:00
Modules/M01-manage-images-azure-container-registry
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/1-introduction.yml b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/1-introduction.yml
@@ -4,7 +4,7 @@ title: Introduction
 metadata:
   title: Introduction
   description: "Introduction"
-  ms.date: 02/06/2023
+  ms.date: 04/25/2023
   author: wwlpublish
   ms.author: jeffko
   ms.topic: interactive-tutorial
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/2-azure-container-registry-overview.yml b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/2-azure-container-registry-overview.yml
@@ -4,7 +4,7 @@ title: Discover the Azure Container Registry
 metadata:
   title: Discover the Azure Container Registry
   description: "Discover the Azure Container Registry"
-  ms.date: 02/06/2023
+  ms.date: 04/25/2023
   author: wwlpublish
   ms.author: jeffko
   ms.topic: interactive-tutorial
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/3-azure-container-registry-storage.yml b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/3-azure-container-registry-storage.yml
@@ -4,7 +4,7 @@ title: Explore storage capabilities
 metadata:
   title: Explore storage capabilities
   description: "Explore storage capabilities"
-  ms.date: 02/06/2023
+  ms.date: 04/25/2023
   author: wwlpublish
   ms.author: jeffko
   ms.topic: interactive-tutorial
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/4-azure-container-registry-tasks.yml b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/4-azure-container-registry-tasks.yml
@@ -4,7 +4,7 @@ title: Build and manage containers with tasks
 metadata:
   title: Build and manage containers with tasks
   description: "Build and manage containers with tasks"
-  ms.date: 02/06/2023
+  ms.date: 04/25/2023
   author: wwlpublish
   ms.author: jeffko
   ms.topic: interactive-tutorial
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/5-dockerfile-components.yml b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/5-dockerfile-components.yml
@@ -4,7 +4,7 @@ title: Explore elements of a Dockerfile
 metadata:
   title: Explore elements of a Dockerfile
   description: "Explore elements of a Dockerfile"
-  ms.date: 02/06/2023
+  ms.date: 04/25/2023
   author: wwlpublish
   ms.author: jeffko
   ms.topic: interactive-tutorial
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/6-build-run-image-azure-container-registry.yml b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/6-build-run-image-azure-container-registry.yml
@@ -4,7 +4,7 @@ title: 'Exercise: Build and run a container image by using Azure Container Regis
 metadata:
   title: 'Exercise: Build and run a container image by using Azure Container Registry Tasks'
   description: "Exercise: Build and run a container image by using Azure Container Registry Tasks"
-  ms.date: 02/06/2023
+  ms.date: 04/25/2023
   author: wwlpublish
   ms.author: jeffko
   ms.topic: interactive-tutorial
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/7-knowledge-check.yml b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/7-knowledge-check.yml
@@ -4,7 +4,7 @@ title: Knowledge check
 metadata:
   title: Knowledge check
   description: "Knowledge check"
-  ms.date: 02/06/2023
+  ms.date: 04/25/2023
   author: wwlpublish
   ms.author: jeffko
   ms.topic: interactive-tutorial
@@ -17,10 +17,21 @@ quiz:
     choices:
     - content: "Basic"
       isCorrect: false
-      explanation: "That's incorrect. The basic tier doesn't support geo-replication."
+      explanation: "Incorrect. The basic tier doesn't support geo-replication."
     - content: "Standard"
       isCorrect: false
-      explanation: "That's incorrect. The standard tier doesn't support geo-replication."
+      explanation: "Incorrect. The standard tier doesn't support geo-replication."
     - content: "Premium"
       isCorrect: true
-      explanation: "That's correct. The premium tier adds geo-replication as a feature."
+      explanation: "Correct. The premium tier adds geo-replication as a feature."
+  - content: "Which Azure container registry tiers benefit from encryption-at-rest?"
+    choices:
+    - content: "Basic, Standard, and Premium"
+      isCorrect: true
+      explanation: "Correct. Encryption-at-rest is supported in all three tiers."
+    - content: "Basic and Standard only"
+      isCorrect: false
+      explanation: "Incorrect. Encryption-at-rest is supported in all three tiers."
+    - content: "Premium only"
+      isCorrect: false
+      explanation: "Incorrect. Encryption-at-rest is supported in all three tiers."
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/8-summary.yml b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/8-summary.yml
@@ -4,7 +4,7 @@ title: Summary
 metadata:
   title: Summary
   description: "Summary"
-  ms.date: 02/06/2023
+  ms.date: 04/25/2023
   author: wwlpublish
   ms.author: jeffko
   ms.topic: interactive-tutorial
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/includes/3-azure-container-registry-storage.md b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/includes/3-azure-container-registry-storage.md
@@ -1,14 +1,14 @@
 
-Every Basic, Standard, and Premium Azure container registry benefits from advanced Azure storage features like encryption-at-rest for image data security and geo-redundancy for image data protection. 
+Basic, Standard, and Premium Azure container registry tiers benefit from advanced Azure storage features like encryption-at-rest for image data security and geo-redundancy for image data protection. 
 
 * **Encryption-at-rest:** All container images in your registry are encrypted at rest. Azure automatically encrypts an image before storing it, and decrypts it on-the-fly when you or your applications and services pull the image.
 
 * **Regional storage:** Azure Container Registry stores data in the region where the registry is created, to help customers meet data residency and compliance requirements. In all regions except Brazil South and Southeast Asia, Azure may also store registry data in a paired region in the same geography. In the Brazil South and Southeast Asia regions, registry data is always confined to the region, to accommodate data residency requirements for those regions.
 
-    If a regional outage occurs, the registry data may become unavailable and is not automatically recovered. Customers who wish to have their registry data stored in multiple regions for better performance across different geographies or who wish to have resiliency in the event of a regional outage should enable geo-replication.
+    If a regional outage occurs, the registry data may become unavailable and isn't automatically recovered. Customers who wish to have their registry data stored in multiple regions for better performance across different geographies or who wish to have resiliency in the event of a regional outage should enable geo-replication.
 
 * **Zone redundancy:** A feature of the Premium service tier, zone redundancy uses Azure availability zones to replicate your registry to a minimum of three separate zones in each enabled region.
 
 * **Scalable storage:** Azure Container Registry allows you to create as many repositories, images, layers, or tags as you need, up to the registry [storage limit](/azure/container-registry/container-registry-skus#service-tier-features-and-limits).
 
-    Very high numbers of repositories and tags can impact the performance of your registry. Periodically delete unused repositories, tags, and images as part of your registry maintenance routine. Deleted registry resources like repositories, images, and tags *cannot* be recovered after deletion. 
+    High numbers of repositories and tags can impact the performance of your registry. Periodically delete unused repositories, tags, and images as part of your registry maintenance routine. Deleted registry resources like repositories, images, and tags *can't* be recovered after deletion. 
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/includes/4-azure-container-registry-tasks.md b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/includes/4-azure-container-registry-tasks.md
@@ -6,8 +6,8 @@ ACR Tasks is a suite of features within Azure Container Registry. It provides cl
 ACR Tasks supports several scenarios to build and maintain container images and other artifacts. 
 
 * **Quick task** - Build and push a single container image to a container registry on-demand, in Azure, without needing a local Docker Engine installation. Think `docker build`, `docker push` in the cloud.
-* **Automatically triggered tasks** - Enable one or more *triggers* to build an image:
 
+* **Automatically triggered tasks** - Enable one or more *triggers* to build an image:
     * Trigger on source code update
     * Trigger on base image update
     * Trigger on a schedule
@@ -24,7 +24,7 @@ Using the familiar `docker build` format, the [az acr build](/cli/azure/acr#az-a
 
 ## Trigger task on source code update
 
-Trigger a container image build or multi-step task when code is committed, or a pull request is made or updated, to a public or private Git repository in GitHub or Azure DevOps. For example, configure a build task with the Azure CLI command `az acr task create` by specifying a Git repository and optionally a branch and Dockerfile. When your team updates code in the repository, an ACR Tasks-created webhook triggers a build of the container image defined in the repo.
+Trigger a container image build or multi-step task when code is committed, or a pull request is made or updated, to a Git repository in GitHub or Azure DevOps Services. For example, configure a build task with the Azure CLI command `az acr task create` by specifying a Git repository and optionally a branch and Dockerfile. When your team updates code in the repository, an ACR Tasks-created webhook triggers a build of the container image defined in the repo.
 
 ## Trigger on base image update
 
@@ -44,3 +44,12 @@ Multi-step tasks, defined in a [YAML file](/azure/container-registry/container-r
 1.  Run the web application test container, which performs tests against the running application container
 1.  If the tests pass, build a Helm chart archive package
 1.  Perform a `helm upgrade` using the new Helm chart archive package
+
+## Image platforms
+
+By default, ACR Tasks builds images for the Linux OS and the amd64 architecture. Specify the `--platform` tag to build Windows images or Linux images for other architectures. Specify the OS and optionally a supported architecture in OS/architecture format (for example, `--platform Linux/arm`). For ARM architectures, optionally specify a variant in OS/architecture/variant format (for example, `--platform Linux/arm64/v8`):
+
+| OS | Architecture |
+|---|---|
+| Linux | amd64<br/>arm<br/>arm64<br/>386 |
+| Windows | amd64 |
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/includes/5-dockerfile-components.md b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/includes/5-dockerfile-components.md
@@ -1,52 +1,46 @@
 
-If you want to create a custom container you will need to understand the elements of a Dockerfile. A Dockerfile is a text file that contains the instructions we use to build and run a Docker image.  The following aspects of the image are defined:
+A Dockerfile is a script that contains a series of instructions that are used to build a Docker image.  Dockerfiles typically include the following information:
 
 * The base or parent image we use to create the new image
-* Commands to update the base OS and install additional software
+* Commands to update the base OS and install other software
 * Build artifacts to include, such as a developed application
 * Services to expose, such a storage and network configuration
 * Command to run when the container is launched
 
-Let's map these aspects to an example Dockerfile. Suppose we're creating a Docker image for an ASP.NET Core website. The Dockerfile may look like the following example.
+## Create a Dockerfile
 
-```bash
-# Step 1: Specify the parent image for the new image
-FROM ubuntu:18.04
+The first step in creating a Dockerfile is choosing a base image that serves as the foundation for your application. For example, if you're building a .NET application, you might choose a Microsoft .NET image as your base.
 
-# Step 2: Update OS packages and install additional software
-RUN apt -y update &&  apt install -y wget nginx software-properties-common apt-transport-https \
-	&& wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-	&& dpkg -i packages-microsoft-prod.deb \
-	&& add-apt-repository universe \
-	&& apt -y update \
-	&& apt install -y dotnet-sdk-3.0
+```dockerfile
+# Use the .NET 6 runtime as a base image
+FROM mcr.microsoft.com/dotnet/runtime:6.0
 
-# Step 3: Start Nginx environment
-CMD service nginx start
-
-# Step 4: Configure Nginx environment
-COPY ./default /etc/nginx/sites-available/default
-
-# STEP 5: Configure work directory
+# Set the working directory to /app
 WORKDIR /app
 
-# STEP 6: Copy website code to container
-COPY ./website/. .
+# Copy the contents of the published app to the container's /app directory
+COPY bin/Release/net6.0/publish/ .
 
-# STEP 7: Configure network requirements
-EXPOSE 80:8080
+# Expose port 80 to the outside world
+EXPOSE 80
 
-# STEP 8: Define the entry point of the process that runs in the container
-ENTRYPOINT ["dotnet", "website.dll"]
+# Set the command to run when the container starts
+CMD ["dotnet", "MyApp.dll"]
 ```
 
-We're not going to cover the Dockerfile file specification here or the detail of each command in our above example. However, notice that there are several commands in this file that allow us to manipulate the structure of the image.
+Let's go through each line to see what it does:
 
-Each of these steps creates a cached container image as we build the final container image. These temporary images are layered on top of the previous and presented as single image once all steps complete.
+* **`FROM mcr.microsoft.com/dotnet/runtime:6.0`**: This command sets the base image to the .NET 6 runtime, which is needed to run .NET 6 apps.
+* **`WORKDIR /app`**: Sets the working directory to `/app`, which is where app files are copied.
+* **`COPY bin/Release/net6.0/publish/ .`**: Copies the contents of the published app to the container's `/app` directory. We assume that the .NET 6 app has already been built and published to the `bin/Release/net6.0/publish` directory.
+* **`EXPOSE 80`**: Exposes port 80, which is the default HTTP port, to the outside world. Change this line accordingly if your app listens on a different port. 
+* **`CMD ["dotnet", "MyApp.dll"]`**: The command to run when the container starts. In this case, we're running the dotnet command with the name of our app's DLL file (`MyApp.dll`). Change this line to match your apps name and entry point.
 
-Finally, notice the last step, step 8. The `ENTRYPOINT` in the file indicates which process will execute once we run a container from an image.
+We're not going to cover the Dockerfile file specification, visit the [Dockerfile reference](https://docs.docker.com/engine/reference/builder/) for more information. Each of these steps creates a cached container image as we build the final container image. These temporary images are layered on top of the previous and presented as single image once all steps complete.
 
-## Additional resources
+## Resources
 
-* Dockerfile reference
-    * [https://docs.docker.com/engine/reference/builder/](https://docs.docker.com/engine/reference/builder/)
+* Docker run reference (CLI)
+    * [https://docs.docker.com/engine/reference/run/](https://docs.docker.com/engine/reference/run/)
+* Docker build reference
+    * [https://docs.docker.com/engine/reference/commandline/build/](https://docs.docker.com/engine/reference/commandline/build/)
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/includes/6-build-run-image-azure-container-registry.md b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/includes/6-build-run-image-azure-container-registry.md
@@ -1,5 +1,5 @@
 
-In this exercise you will use ACR Tasks to perform the following actions:
+In this exercise you use ACR Tasks to perform the following actions:
 
 * Create an Azure Container Registry
 * Build and push image from a Dockerfile
@@ -10,39 +10,39 @@ In this exercise you will use ACR Tasks to perform the following actions:
 
 * An **Azure account** with an active subscription. If you don't already have one, you can sign up for a free trial at [https://azure.com/free](https://azure.com/free)
 
-## Login to Azure and start the Cloud Shell
+## Sign in to Azure and start the Cloud Shell
 
-1. Login to the [Azure portal](https://portal.azure.com) and open the Cloud Shell.
+1. Sign in to the [Azure portal](https://portal.azure.com) and open the Cloud Shell.
 
     :::image type="content" source="../media/cloud-shell-menu.png" alt-text="The location of Cloud Shell launch button.":::
 
-1. After the shell opens be sure to select the **Bash** environment.
+1. When the shell opens select the **Bash** environment.
 
     :::image type="content" source="../media/shell-bash-selection.png" alt-text="Selecting the Bash environment.":::
 
 ## Create an Azure Container Registry
 
-1. Create a resource group for the registry, replace `<myLocation>` in the command below with a location near you.
+1. Create a resource group for the registry, replace `<myLocation>` in the following command with a location near you.
 
     ```bash
     az group create --name az204-acr-rg --location <myLocation>
     ```
 
-1. Create a basic container registry. The registry name must be unique within Azure, and contain 5-50 alphanumeric characters. Replace `<myContainerRegistry>` in the command below with a unique value.
+1. Create a basic container registry. The registry name must be unique within Azure, and contain 5-50 alphanumeric characters. Replace `<myContainerRegistry>` in the following command with a unique value.
 
     ```bash
     az acr create --resource-group az204-acr-rg \
         --name <myContainerRegistry> --sku Basic
     ```
 
     > [!NOTE]
-    > The command above creates a *Basic* registry, a cost-optimized option for developers learning about Azure Container Registry.
+    > The command creates a *Basic* registry, a cost-optimized option for developers learning about Azure Container Registry.
 
 ## Build and push image from a Dockerfile
 
 Now use Azure Container Registry to build and push an image based on a local Dockerfile.
 
-1. Create, or navigate, to a local directory and then use the command below to create the Dockerfile. The Dockerfile will contain a single line that references the `hello-world` image hosted at the Microsoft Container Registry.
+1. Create, or navigate, to a local directory and then use the following command to create the Dockerfile. The Dockerfile contains a single line that references the `hello-world` image hosted at the Microsoft Container Registry.
 
     ```bash
     echo FROM mcr.microsoft.com/hello-world > Dockerfile
@@ -56,7 +56,7 @@ Now use Azure Container Registry to build and push an image based on a local Doc
         --file Dockerfile .
     ```
 
-    The command above will generate a lot of output, below is shortened sample of that output showing the last few lines with the final results. You can see in the `repository` field the `sample/hello-word` image is listed.
+    Following is a shortened sample of the output from the previous command showing the last few lines with the final results. You can see in the `repository` field the `sample/hello-word` image is listed.
 
     ```
     - image:
@@ -115,9 +115,9 @@ Now use Azure Container Registry to build and push an image based on a local Doc
         --cmd '$Registry/sample/hello-world:v1' /dev/null
     ```
 
-    The `cmd` parameter in this example runs the container in its default configuration, but `cmd` supports additional `docker run` parameters or even other `docker` commands. 
+    The `cmd` parameter in this example runs the container in its default configuration, but `cmd` supports other `docker run` parameters or even other `docker` commands. 
 
-    Below is shortened sample of the output:
+    The following is shortened sample of the output:
 
     ```
     Packing source code into tar to upload...
diff --git a/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/index.yml b/learn-pr/wwl-azure/publish-container-image-to-azure-container-registry/index.yml
@@ -3,7 +3,7 @@ uid: learn.wwl.publish-container-image-to-azure-container-registry
 metadata:
   title: Manage container images in Azure Container Registry
   description: "Learn how to use Azure Container Registry to store your container images, and automate builds and deployments."
-  ms.date: 02/06/2023
+  ms.date: 04/25/2023
   author: wwlpublish
   ms.author: jeffko
   ms.topic: interactive-tutorial
