Skip to content

Commit 482c5ff

Browse files
Merge pull request #104647 from john-par/1669724-update-documents-with-correct-azure-cli-tags-02-17
1669724-update-documents-with-correct-azure-cli-tags-02-17
2 parents 6af4d10 + 0a3ffbc commit 482c5ff

23 files changed

+121
-72
lines changed

articles/container-instances/container-instances-environment-variables.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ az container logs --resource-group myResourceGroup --name mycontainer2
5252

5353
The output of the containers show how you've modified the second container's script behavior by setting environment variables.
5454

55-
```console
56-
azureuser@Azure:~$ az container logs --resource-group myResourceGroup --name mycontainer1
55+
**mycontainer1**
56+
```output
5757
[('the', 990),
5858
('and', 702),
5959
('of', 628),
@@ -64,8 +64,10 @@ azureuser@Azure:~$ az container logs --resource-group myResourceGroup --name myc
6464
('my', 441),
6565
('in', 399),
6666
('HAMLET', 386)]
67+
```
6768

68-
azureuser@Azure:~$ az container logs --resource-group myResourceGroup --name mycontainer2
69+
**mycontainer2**
70+
```output
6971
[('CLAUDIUS', 120),
7072
('POLONIUS', 113),
7173
('GERTRUDE', 82),

articles/container-instances/container-instances-exec.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ az container exec --resource-group myResourceGroup --name mynginx --exec-command
2525

2626
In the example output below, the Bash shell is launched in a running Linux container, providing a terminal in which `ls` is executed:
2727

28-
```console
29-
$ az container exec --resource-group myResourceGroup --name mynginx --exec-command "/bin/bash"
28+
```output
3029
root@caas-83e6c883014b427f9b277a2bba3b7b5f-708716530-2qv47:/# ls
3130
bin dev home lib64 mnt proc run srv tmp var
3231
boot etc lib media opt root sbin sys usr
@@ -37,8 +36,11 @@ Bye.
3736

3837
In this example, Command Prompt is launched in a running Nanoserver container:
3938

40-
```console
41-
$ az container exec --resource-group myResourceGroup --name myiis --exec-command "cmd.exe"
39+
```azurecli
40+
az container exec --resource-group myResourceGroup --name myiis --exec-command "cmd.exe"
41+
```
42+
43+
```output
4244
Microsoft Windows [Version 10.0.14393]
4345
(c) 2016 Microsoft Corporation. All rights reserved.
4446

articles/container-instances/container-instances-get-logs.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ To view logs from your application code within a container, you can use the [az
1616

1717
The following is log output from the example task-based container in [Set the command line in a container instance](container-instances-start-command.md#azure-cli-example), after having provided an invalid URL using a command-line override:
1818

19-
```console
20-
$ az container logs --resource-group myResourceGroup --name mycontainer
19+
```azurecli
20+
az container logs --resource-group myResourceGroup --name mycontainer
21+
```
22+
23+
```output
2124
Traceback (most recent call last):
2225
File "wordcount.py", line 11, in <module>
2326
urllib.request.urlretrieve (sys.argv[1], "foo.txt")
@@ -44,8 +47,11 @@ The [az container attach][az-container-attach] command provides diagnostic infor
4447

4548
For example, here is output from the task-based container in [Set the command line in a container instance](container-instances-start-command.md#azure-cli-example), after having supplied a valid URL of a large text file to process:
4649

47-
```console
48-
$ az container attach --resource-group myResourceGroup --name mycontainer
50+
```azurecli
51+
az container attach --resource-group myResourceGroup --name mycontainer
52+
```
53+
54+
```output
4955
Container 'mycontainer' is in state 'Unknown'...
5056
Container 'mycontainer' is in state 'Waiting'...
5157
Container 'mycontainer' is in state 'Running'...

articles/container-instances/container-instances-monitor.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,11 @@ CONTAINER_GROUP=$(az container show --resource-group <resource-group> --name <co
5151

5252
Use the following command to get **CPU** usage metrics.
5353

54-
```console
55-
$ az monitor metrics list --resource $CONTAINER_GROUP --metric CPUUsage --output table
54+
```azurecli
55+
az monitor metrics list --resource $CONTAINER_GROUP --metric CPUUsage --output table
56+
```
5657

58+
```output
5759
Timestamp Name Average
5860
------------------- --------- ---------
5961
2019-04-23 22:59:00 CPU Usage
@@ -72,9 +74,11 @@ Timestamp Name Average
7274

7375
Change the value of the `--metric` parameter in the command to get other [supported metrics][supported-metrics]. For example, use the following command to get **memory** usage metrics.
7476

75-
```console
76-
$ az monitor metrics list --resource $CONTAINER_GROUP --metric MemoryUsage --output table
77+
```azurecli
78+
az monitor metrics list --resource $CONTAINER_GROUP --metric MemoryUsage --output table
79+
```
7780

81+
```output
7882
Timestamp Name Average
7983
------------------- ------------ ----------
8084
2019-04-23 22:59:00 Memory Usage
@@ -93,9 +97,11 @@ Timestamp Name Average
9397

9498
For a multi-container group, the `containerName` dimension can be added to return metrics per container.
9599

96-
```console
97-
$ az monitor metrics list --resource $CONTAINER_GROUP --metric MemoryUsage --dimension containerName --output table
100+
```azurecli
101+
az monitor metrics list --resource $CONTAINER_GROUP --metric MemoryUsage --dimension containerName --output table
102+
```
98103

104+
```output
99105
Timestamp Name Containername Average
100106
------------------- ------------ -------------------- -----------
101107
2019-04-23 22:59:00 Memory Usage aci-tutorial-app

articles/container-instances/container-instances-quickstart.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ az container show --resource-group myResourceGroup --name mycontainer --query "{
5050

5151
When you run the command, the container's fully qualified domain name (FQDN) and its provisioning state are displayed.
5252

53-
```console
54-
$ az container show --resource-group myResourceGroup --name mycontainer --query "{FQDN:ipAddress.fqdn,ProvisioningState:provisioningState}" --out table
53+
```output
5554
FQDN ProvisioningState
5655
--------------------------------- -------------------
5756
aci-demo.eastus.azurecontainer.io Succeeded
@@ -75,8 +74,7 @@ az container logs --resource-group myResourceGroup --name mycontainer
7574

7675
The output displays the logs for the container, and should show the HTTP GET requests generated when you viewed the application in your browser.
7776

78-
```console
79-
$ az container logs --resource-group myResourceGroup --name mycontainer
77+
```output
8078
listening on port 80
8179
::ffff:10.240.255.55 - - [21/Mar/2019:17:43:53 +0000] "GET / HTTP/1.1" 304 - "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36"
8280
::ffff:10.240.255.55 - - [21/Mar/2019:17:44:36 +0000] "GET / HTTP/1.1" 304 - "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.121 Safari/537.36"
@@ -95,8 +93,7 @@ az container attach --resource-group myResourceGroup --name mycontainer
9593

9694
Once attached, refresh your browser a few times to generate some additional output. When you're done, detach your console with `Control+C`. You should see output similar to the following:
9795

98-
```console
99-
$ az container attach --resource-group myResourceGroup --name mycontainer
96+
```output
10097
Container 'mycontainer' is in state 'Running'...
10198
(count: 1) (last timestamp: 2019-03-21 17:27:20+00:00) pulling image "mcr.microsoft.com/azuredocs/aci-helloworld"
10299
(count: 1) (last timestamp: 2019-03-21 17:27:24+00:00) Successfully pulled image "mcr.microsoft.com/azuredocs/aci-helloworld"

articles/container-instances/container-instances-tutorial-deploy-app.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ az container show --resource-group myResourceGroup --name aci-tutorial-app --que
6666
```
6767

6868
For example:
69-
7069
```output
7170
"aci-demo.eastus.azurecontainer.io"
7271
```

articles/container-instances/container-instances-tutorial-prepare-acr.md

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ az acr create --resource-group myResourceGroup --name <acrName> --sku Basic
4141

4242
Here's example output for a new Azure container registry named *mycontainerregistry082* (shown here truncated):
4343

44-
```console
45-
$ az acr create --resource-group myResourceGroup --name mycontainerregistry082 --sku Basic
44+
```output
4645
...
4746
{
4847
"creationDate": "2018-03-16T21:54:47.297875+00:00",
@@ -73,10 +72,15 @@ You must log in to your Azure Container Registry instance before pushing images
7372
az acr login --name <acrName>
7473
```
7574

75+
For example:
76+
77+
```azurecli
78+
az acr login --name mycontainerregistry082
79+
```
80+
7681
The command returns `Login Succeeded` once completed:
7782

78-
```console
79-
$ az acr login --name mycontainerregistry082
83+
```output
8084
Login Succeeded
8185
```
8286

@@ -92,8 +96,11 @@ az acr show --name <acrName> --query loginServer --output table
9296

9397
For example, if your registry is named *mycontainerregistry082*:
9498

95-
```console
96-
$ az acr show --name mycontainerregistry082 --query loginServer --output table
99+
```azurecli
100+
az acr show --name mycontainerregistry082 --query loginServer --output table
101+
```
102+
103+
```output
97104
Result
98105
------------------------
99106
mycontainerregistry082.azurecr.io
@@ -160,8 +167,11 @@ az acr repository list --name <acrName> --output table
160167

161168
For example:
162169

163-
```console
164-
$ az acr repository list --name mycontainerregistry082 --output table
170+
```azurecli
171+
az acr repository list --name mycontainerregistry082 --output table
172+
```
173+
174+
```output
165175
Result
166176
----------------
167177
aci-tutorial-app
@@ -176,7 +186,7 @@ az acr repository show-tags --name <acrName> --repository aci-tutorial-app --out
176186
You should see output similar to the following:
177187

178188
```console
179-
$ az acr repository show-tags --name mycontainerregistry082 --repository aci-tutorial-app --output table
189+
az acr repository show-tags --name mycontainerregistry082 --repository aci-tutorial-app --output table
180190
Result
181191
--------
182192
v1

articles/container-instances/container-instances-using-azure-container-registry.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ az container create \
109109

110110
The `--dns-name-label` value must be unique within Azure, so the preceding command appends a random number to the container's DNS name label. The output from the command displays the container's fully qualified domain name (FQDN), for example:
111111

112-
```console
113-
$ az container create --name aci-demo --resource-group $RES_GROUP --image $ACR_LOGIN_SERVER/aci-helloworld:v1 --registry-login-server $ACR_LOGIN_SERVER --registry-username $(az keyvault secret show --vault-name $AKV_NAME -n $ACR_NAME-pull-usr --query value -o tsv) --registry-password $(az keyvault secret show --vault-name $AKV_NAME -n $ACR_NAME-pull-pwd --query value -o tsv) --dns-name-label aci-demo-$RANDOM --query ipAddress.fqdn
112+
```output
114113
"aci-demo-25007.eastus.azurecontainer.io"
115114
```
116115

articles/container-instances/container-instances-volume-gitrepo.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,11 @@ az container create \
4343

4444
To verify the gitRepo volume was mounted, launch a shell in the container with [az container exec][az-container-exec] and list the directory:
4545

46-
```console
47-
$ az container exec --resource-group myResourceGroup --name hellogitrepo --exec-command /bin/sh
46+
```azurecli
47+
az container exec --resource-group myResourceGroup --name hellogitrepo --exec-command /bin/sh
48+
```
49+
50+
```output
4851
/usr/src/app # ls -l /mnt/aci-helloworld/
4952
total 16
5053
-rw-r--r-- 1 root root 144 Apr 16 16:35 Dockerfile

articles/container-instances/container-instances-volume-secret.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ az container create \
2929

3030
The following [az container exec][az-container-exec] output shows opening a shell in the running container, listing the files within the secret volume, then displaying their contents:
3131

32-
```console
33-
$ az container exec --resource-group myResourceGroup --name secret-volume-demo --exec-command "/bin/sh"
32+
```azurecli
33+
az container exec --resource-group myResourceGroup --name secret-volume-demo --exec-command "/bin/sh"
34+
```
35+
36+
```output
3437
/usr/src/app # ls -1 /mnt/secrets
3538
mysecret1
3639
mysecret2

0 commit comments

Comments
 (0)