Skip to content

Commit 9adaaea

Browse files
committed
correx
1 parent 4707230 commit 9adaaea

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

articles/container-instances/container-instances-github-action.md

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ First, get the resource ID of your resource group. Substitute the name of your g
5252

5353
```azurecli
5454
groupId=$(az group show \
55-
--name <registry-name> \
55+
--name <resource-group-name> \
5656
--query id --output tsv)
5757
```
5858

@@ -82,11 +82,11 @@ Output is similar to:
8282
}
8383
```
8484

85-
Save the JSON output because it is used in a later step. Also, take note of the `clientID`, which you need to update the service principal in the next section.
85+
Save the JSON output because it is used in a later step. Also, take note of the `clientId`, which you need to update the service principal in the next section.
8686

8787
### Update service principal for registry authentication
8888

89-
Update the Azure service principal credentials to allow push and pull permissions on your container registry. This step allows you to use the service principal to [authenticate with your container registry](../container-registry/container-registry-auth-service-principal.md).
89+
Update the Azure service principal credentials to allow push and pull permissions on your container registry. This step allows you the GitHub workflow to us the service principal to [authenticate with your container registry](../container-registry/container-registry-auth-service-principal.md).
9090

9191
Get the resource ID of your container registry. Substitute the name of your registry in the following [az acr show][az-acr-show] command:
9292

@@ -107,15 +107,17 @@ az role assignment create \
107107

108108
### Save credentials to GitHub repo
109109

110-
In the GitHub UI, navigate to your forked repository and select **Settings** > **Secrets**. Select **Add a new secret** to add the following secrets:
110+
1. In the GitHub UI, navigate to your forked repository and select **Settings** > **Secrets**.
111+
112+
1. Select **Add a new secret** to add the following secrets:
111113

112114
|Secret |Value |
113115
|---------|---------|
114116
|`AZURE_CREDENTIALS` | The entire JSON output from the service principal creation |
115117
|`REGISTRY_LOGIN_SERVER` | The login server name of your registry (all lowercase). Example: *myregistry.azure.cr.io* |
116118
|`REGISTRY_USERNAME` | The `clientId` from the JSON output from the service principal creation |
117119
|`REGISTRY_PASSWORD` | The `clientSecret` from the JSON output from the service principal creation |
118-
| `RESOURCE_GROUP` | Name | The name of the resource group you used to scope the service principal |
120+
| `RESOURCE_GROUP` | The name of the resource group you used to scope the service principal |
119121

120122
### Create workflow file
121123

@@ -170,7 +172,7 @@ After you commit the workflow file, the workflow is triggered. To review workflo
170172
171173
![View workflow progress](./media/container-instances-github-action/github-action-progress.png)
172174
173-
When the workflow completes, get information about the container instance named `aci-sampleapp` by running the [az container show][az-container-show] command. Substitute the name of your resource group:
175+
When the workflow completes, get information about the container instance named *aci-sampleapp* by running the [az container show][az-container-show] command. Substitute the name of your resource group:
174176
175177
```azurecli
176178
az container show \
@@ -188,13 +190,13 @@ FQDN ProvisioningState
188190
aci-action01.westus.azurecontainer.io Succeeded
189191
```
190192

191-
After the instance is provisioned, navigate to the container's FQDN in your browser to view the web app.
193+
After the instance is provisioned, navigate to the container's FQDN in your browser to view the running web app.
192194

193195
![Running web app in browser](./media/container-instances-github-action/github-action-container.png)
194196

195-
## Use the Azure CLI
197+
## Use Deploy to Azure extension
196198

197-
Alternatively, use the [Deploy to Azure extension](https://github.com/Azure/deploy-to-azure-cli-extension) in the Azure CLI to configure the workflow. The `az container app up` command in the extension takes minimal input parameters from you and creates a GitHub workflow for you in your repository.
199+
Alternatively, use the [Deploy to Azure extension](https://github.com/Azure/deploy-to-azure-cli-extension) in the Azure CLI to configure the workflow. The `az container app up` command in the extension takes minimal input parameters from you to set up a workflow to deploy to Azure Container Instances.
198200

199201
The workflow created by the Azure CLI is similar to the workflow you can [create manually using GitHub](#configure-github-workflow).
200202

@@ -228,15 +230,15 @@ az container app up \
228230
--repository https://github.com/myID/acr-build-helloworld-node
229231
```
230232

231-
When prompted, provide your GitHub credentials. The command then creates a personal access token (PAT) to authenticate with your registry. The token has *repo* and *user* scopes on the repo. Alternatively, [create your own PAT](https://help.github.com/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line) with those scopes and supply that when prompted.
233+
When prompted, provide your GitHub credentials. The command then creates a personal access token (PAT) to authenticate with your registry. The token has *repo* and *user* scopes on the repo. Alternatively, [create your own PAT](https://help.github.com/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line) with those scopes and supply the PAT when prompted.
232234

233235
The command creates:
234236

235237
* Service principal credentials for the workflow
236238
* Credentials to access the Azure container registry
237-
* A YAML file to define the GitHub workflow. By default the filename is `main.yml` but you can provide a different filename.
239+
* A YAML file to define the GitHub workflow. Accept the default filename `main.yml`, or provide a filename you choose.
238240

239-
After you provide input to commit the workflow file to your repo, the workflow is triggered. Output is similar to:
241+
After you commit the workflow file to your repo, the workflow is triggered. Output is similar to:
240242

241243
```console
242244
[...]
@@ -248,7 +250,9 @@ Workflow succeeded
248250
Your app is deployed at: http://acr-build-helloworld-node.eastus.azurecontainer.io:8080/
249251
```
250252

251-
The workflow deploys an Azure container instance with the base name of your GitHub repo. In this case, the instance name is *acr-build-helloworld-node*. In your browser, you can browse to the link provided to view the running web app.
253+
### Validate workflow
254+
255+
The workflow deploys an Azure container instance with the base name of your GitHub repo, in this case, *acr-build-helloworld-node*. In your browser, you can browse to the link provided to view the running web app.
252256

253257
To view the workflow status and results of each step in the GitHub UI, see [Managing a workflow run](https://help.github.com/actions/configuring-and-managing-workflows/managing-a-workflow-run).
254258

0 commit comments

Comments
 (0)