updates in progress

dlepow · dlepow · commit 9534132db59c · 2020-04-13T21:11:50.000-07:00
diff --git a/articles/container-registry/container-registry-tasks-template.md b/articles/container-registry/container-registry-tasks-template.md
@@ -1,20 +1,20 @@
 ---
 title: Run task using template
-description: Run an ACR task using an Azure Resource Manager template
+description: Run an ACR quick task using an Azure Resource Manager template
 ms.topic: article
-ms.date: 03/25/2020
+ms.date: 04/13/2020
 ---
 
 # Run ACR Tasks using Resource Manager templates
 
 [ACR Tasks](container-registry-tasks-overview.md) is a suite of features within Azure Container Registry to help you manage and modify container images across the container lifecycle. 
 
-This article shows how to use an Azure Resource Manager template to queue a [quick task](container-registry-tasks-overview.md#quick-task), similar to one you can create manually using the [az acr build][az-acr-build] command.
+This article shows Azure Resource Manager template examples to queue a [quick task](container-registry-tasks-overview.md#quick-task), similar to one you can create manually using the [az acr build][az-acr-build] command.
 
-A Resource Manager template to queue a task is useful in automation scenarios. For example:
+A Resource Manager template to queue a task is useful in automation scenarios and extends the functionality in a quick task with `az acr build`. For example:
 
 * Use a template to create a container registry and immediately queue an ACR task to build or push a container image
-* Automate creation of additional resources you can use in a quick task, such as a managed identity for Azure resources. The template-based creation of a quick task allows you to use a managed identity, which currently isn't supported with `az acr build`.
+* Automate creation of additional resources you can use in a quick task, such as a managed identity for Azure resources
 
 ## Limitations
 
@@ -24,35 +24,40 @@ A Resource Manager template to queue a task is useful in automation scenarios. F
 ## Prerequisites
 
 * **GitHub account** - Create an account on https://github.com if you don't already have one. This tutorial series uses a GitHub repository to demonstrate automated image builds in ACR Tasks.
-* **Fork sample repository** - Use the GitHub UI to fork the following sample repository into your GitHub account: https://github.com/Azure-Samples/acr-build-helloworld-node. This repo contains sample Dockerfiles and source code to build small container images.
+* **Fork sample repository** - For the task examples shown here, use the GitHub UI to fork the following sample repository into your GitHub account: https://github.com/Azure-Samples/acr-build-helloworld-node. This repo contains sample Dockerfiles and source code to build small container images.
 
 ## Example: Create registry and queue a build task
 
-This example uses a [sample template](https://github.com/Azure/acr/tree/master/docs/tasks/run-as-deployment/quickdockerbuild) that creates a container registry and queues a task to build and push an image. To use the template:
-
-* First create a resource group, or use an existing group
-* Specify a unique registry name
-* Point to a remote GitHub repo for the build context, such as https://github.com/<your-GitHub-ID>/acr-build-helloworld-node. The Dockerfile in the root of this repo builds a container image for  small Node.js web app. 
+This example uses a [sample template](https://github.com/Azure/acr/tree/master/docs/tasks/run-as-deployment/quickdockerbuild) to create a container registry and queue a task that builds and pushes an image. 
 
 ### Deploy the template
 
-Deploy the template with the [az deployment group create][az-deployment-group-create] command. This example builds and pushes the *helloworld-node:testtask* image to a registry named *mycontainerregistry*:
+Deploy the template with the [az deployment group create][az-deployment-group-create] command. This example builds and pushes the *helloworld-node:testtask* image to a registry named *mycontainerregistry*.
+
+To use the template, provide the following parameters:
+
+* The name of a resource group
+* A unique name for the container registry that's created
+* The repository target of the task
+* The name of the task, which specifies the image tag
+* The remote GitHub repo for the build context, for example, https://github.com/Azure-Samples/acr-build-helloworld-node. The Dockerfile in the root of this repo builds a container image for small Node.js web app. If desired, use your fork of the repo as the build context.
 
 ```azurecli
 az deployment group create \
   --resource-group myResourceGroup \
   --template-uri https://raw.githubusercontent.com/Azure/acr/master/docs/tasks/run-as-deployment/quickdockerbuild/azuredeploy.json \
-  --parameters azuredeploy.parameters.json \
   --parameters \
     registryName=mycontainerregistry \
-    taskRunName=testtask \
     repository=helloworld-node \
-    sourceLocation=https://github.com/<your-GitHub-ID>/acr-build-helloworld-node.git 
+    taskRunName=testtask \
+    sourceLocation=https://github.com/Azure-Samples/acr-build-helloworld-node.git 
  ```
 
+The previous command passes the parameters on the command line. If desired, pass them in the file azuredeploy.parameters.json.
+
 ### Verify deployment
 
-Verify the image is built by running [az acr repository show-tags][az-acr-repository-show-tags]:
+After the deployment completes successfully, verify the image is built by running [az acr repository show-tags][az-acr-repository-show-tags]:
 
 ```azurecli
 az acr repository show-tags \
@@ -94,53 +99,21 @@ az acr task logs \
   --run-id ca1
 ```
 
-Output is similar to:
+The output shows the task log.
 
-```console
-2020/03/23 17:54:29 Downloading source code...
-2020/03/23 17:54:49 Finished downloading source code
-2020/03/23 17:54:50 Using acb_vol_076f6d6d-209f-4b12-8a2a-936e3279ef6f as the home volume
-2020/03/23 17:54:50 Setting up Docker configuration...
-2020/03/23 17:54:51 Successfully set up Docker configuration
-2020/03/23 17:54:51 Logging in to registry: mycontainerregistry.azurecr.io
-2020/03/23 17:54:52 Successfully logged into mycontainerregistry.azurecr.io
-2020/03/23 17:54:52 Executing step ID: build. Timeout(sec): 28800, Working directory: '', Network: ''
-2020/03/23 17:54:52 Scanning for dependencies...
-2020/03/23 17:54:53 Successfully scanned dependencies
-2020/03/23 17:54:53 Launching container with name: build
-Sending build context to Docker daemon  89.09kB
-Step 1/5 : FROM node:9-alpine
-[...]
-testtask: digest: sha256:770789bd67d6ae1cc3eef9035b796ffc1616b1f9d117cf5c83cf48aec89ac464 size: 1367
-2020/03/23 17:55:13 Successfully pushed image: mycontainerregistry.azurecr.io/helloworld-node:testtask
-2020/03/23 17:55:13 Step ID: build marked as successful (elapsed time in seconds: 11.468590)
-2020/03/23 17:55:13 Populating digests for step ID: build...
-2020/03/23 17:55:15 Successfully populated digests for step ID: build
-2020/03/23 17:55:15 Step ID: push marked as successful (elapsed time in seconds: 9.269134)
-2020/03/23 17:55:15 The following dependencies were found:
-2020/03/23 17:55:15 
-- image:
-    registry: mycontainerregistry.azurecr.io
-    repository: helloworld-node
-    tag: testtask
-    digest: sha256:770789bd67d6ae1cc3eef9035b796ffc1616b1f9d117cf5c83cf48aec89ac464
-  runtime-dependency:
-    registry: registry.hub.docker.com
-    repository: library/node
-    tag: 9-alpine
-    digest: sha256:8dafc0968fb4d62834d9b826d85a8feecc69bd72cd51723c62c7db67c6dec6fa
-  git:
-    git-head-revision: a3710d1af24d20fbdc6bb3feeea428fa01138e93
-
-
-Run ID: ca1 was successful after 47s
-```
+You can also view the task run log in the Azure portal. 
+
+1. Navigate to your container registry
+2. Under **Services**, select **Tasks** > **Runs**.
+3. Select the run ID, in this case *ca1*. 
 
-## Example: Task with managed identity
+The portal shows the task log.
 
-This [deployment example](https://github.com/Azure/acr/tree/master/docs/tasks/run-as-deployment/quickdockerbuildwithidentity) queues a task that uses a user-assigned managed identity. During the task run, the identity authenticates to pull an image from another Azure container registry. This scenario is similar to the one in [Cross-registry authentication in an ACR task using an Azure-managed identity](container-registry-tasks-cross-registry-authentication.md). For example, an organization might maintain a *base registry* with base images accessed by multiple development teams.
+## Example: Queue task with managed identity
 
-For this example, you create a managed identity before queuing the task. However, you can also set up a template to automate creation of the identity. 
+Use an [example template](https://github.com/Azure/acr/tree/master/docs/tasks/run-as-deployment/quickdockerbuildwithidentity) to queue a task that enables a user-assigned managed identity. During the task run, the identity authenticates to pull an image from another Azure container registry. This scenario is similar to the one in [Cross-registry authentication in an ACR task using an Azure-managed identity](container-registry-tasks-cross-registry-authentication.md). For example, an organization might maintain a *base registry* with base images accessed by multiple development teams.
+
+The following steps provide commands to create a managed identity before queuing the task. However, you can also set up the task template to automate creation of the identity. 
 
 ### Prepare a base registry
 
@@ -158,7 +131,7 @@ For demonstration purposes, create a separate container registry as your base re
 
 ### Create a new Dockerfile
 
-Create a Dockerfile that pulls the base image from your base registry.
+Create a Dockerfile that pulls the base image from your base registry. Perform the following steps in your local fork of the GitHub repo, for example, `https://github.com/<your-GitHub-ID>/acr-build-helloworld-node.git`.
 
 1. In the GitHub UI, select **Create new file**.
 1. Name your file *Dockerfile-test* and paste the following contents. Substitute your registry name for *mybaseregistry*.
@@ -196,23 +169,31 @@ az role assignment create \
 
 ### Deploy the template
 
+To use the template, provide the following parameters:
+
+* The name of a resource group
+* The remote GitHub repo for the build context, for example, https://github.com/Azure-Samples/acr-build-helloworld-node. The Dockerfile in the root of this repo builds a container image for small Node.js web app. If desired, use your fork of the repo as the build context.
+
 ```azurecli
 az deployment group create \
   --resource-group myResourceGroup \
   --template-uri https://raw.githubusercontent.com/Azure/acr/master/docs/tasks/run-as-deployment/quickdockerbuildwithidentity/azuredeploy.json \
-  --parameters azuredeploy.parameters.json \
   --parameters \
     registryName=mycontainerregistry \
-    taskRunName=basetask \
     repository=helloworld-node \
+    taskRunName=basetask \
     userAssignedIdentity=$resourceID \
-    identityCredential=$clientID \
+    customRegistryIdentity=$clientID \
     sourceLocation=https://github.com/<your-GitHub-ID>/acr-build-helloworld-node.git \
     dockerFilePath=Dockerfile-test \
-    baseRegistry=mybaseregistry.azurecr.io
+    customRegistry=mybaseregistry.azurecr.io
 ```
 
-Verify the image is built by running [az acr repository show-tags][az-acr-repository-show-tags]:
+The previous command passes the parameters on the command line. If desired, pass them in the file azuredeploy.parameters.json.
+
+### Verify deployment
+
+After the deployment completes successfully, verify the image is built by running [az acr repository show-tags][az-acr-repository-show-tags]:
 
 ```azurecli
 az acr repository show-tags \
@@ -228,6 +209,8 @@ Result
 basetask
 ```
 
+### View run log
+
 To view the run log, see steps in the [preceding section](#view-run-log).
 
 ## Next steps
@@ -239,9 +222,12 @@ To view the run log, see steps in the [preceding section](#view-run-log).
 <!-- LINKS - Internal -->
 [azure-cli]: /cli/azure/install-azure-cli
 [az-acr-build]: /cli/azure/acr#az-acr-build
+[az-acr-show]: /cli/azure/acr#az-acr-show
 [az-acr-task-run]: /cli/azure/acr/task#az-acr-task-run
 [az-acr-task-logs]: /cli/azure/acr/task#az-acr-task-logs
+[az-acr-repository-show-tags]: /cli/azure/acr/repository#az-acr-repository-show-tags
 [az-acr-task-list-runs]: /cli/azure/acr/task#az-acr-task-list-runs
 [az-deployment-group-create]: /cli/azure/deployment/group#az-deployment-group-create
 [az-identity-create]: /cli/azure/identity#az-identity-create
-[az-identity-show]: /cli/azure/identity#az-identity-show
+[az-identity-show]: /cli/azure/identity#az-identity-show
+[az-role-assignment-create]: /cli/azure/role/assignment#az-role-assignment-create
diff --git a/includes/container-registry-tasks-user-assigned-id.md b/includes/container-registry-tasks-user-assigned-id.md
@@ -14,21 +14,32 @@ ms.custom: include file
 
 Create an identity named *myACRTasksId* in your subscription using the [az identity create][az-identity-create] command. You can use the same resource group you used previously to create a container registry, or a different one.
 
-```azurecli-interactive
-az identity create --resource-group myResourceGroup --name myACRTasksId
+```azurecli
+az identity create \
+  --resource-group myResourceGroup \
+  --name myACRTasksId
 ```
 
 To configure the user-assigned identity in the following steps, use the [az identity show][az-identity-show] command to store the identity's resource ID, principal ID, and client ID in variables.
 
 ```azurecli
 # Get resource ID of the user-assigned identity
-resourceID=$(az identity show --resource-group myResourceGroup --name myACRTasksId --query id --output tsv)
+resourceID=$(az identity show \
+  --resource-group myResourceGroup \
+  --name myACRTasksId \
+  --query id --output tsv)
 
 # Get principal ID of the task's user-assigned identity
-principalID=$(az identity show --resource-group myResourceGroup --name myACRTasksId --query principalId --output tsv)
+principalID=$(az identity show \
+  --resource-group myResourceGroup \
+  --name myACRTasksId \
+  --query principalId --output tsv)
 
 # Get client ID of the user-assigned identity
-clientID=$(az identity show --resource-group myResourceGroup --name myACRTasksId --query clientId --output tsv)
+clientID=$(az identity show \
+  --resource-group myResourceGroup \
+  --name myACRTasksId \
+  --query clientId --output tsv)
 ```
 
 <!-- LINKS - Internal -->
