Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit b56ef36

Browse files
GordonTheTurtleGordonTheTurtle
committed
Merge component 'cli' from git@github.com:docker/cli 19.03
2 parents 48a6621 + d2a8fe0 commit b56ef36

12 files changed

Lines changed: 28 additions & 24 deletions

File tree

‎components/cli/docs/reference/commandline/plugin_create.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ plugin
3838

3939
$ docker plugin ls
4040

41-
ID NAME TAG DESCRIPTION ENABLED
42-
672d8144ec02 plugin latest A sample plugin for Docker false
41+
ID NAME DESCRIPTION ENABLED
42+
672d8144ec02 plugin:latest A sample plugin for Docker false
4343
```
4444

4545
The plugin can subsequently be enabled for local use or pushed to the public registry.

‎components/cli/docs/reference/commandline/plugin_disable.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ and enabled:
3030
```bash
3131
$ docker plugin ls
3232

33-
ID NAME TAG DESCRIPTION ENABLED
34-
69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker true
33+
ID NAME DESCRIPTION ENABLED
34+
69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker true
3535
```
3636

3737
To disable the plugin, use the following command:
@@ -43,8 +43,8 @@ tiborvass/sample-volume-plugin
4343

4444
$ docker plugin ls
4545

46-
ID NAME TAG DESCRIPTION ENABLED
47-
69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker false
46+
ID NAME DESCRIPTION ENABLED
47+
69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker false
4848
```
4949

5050
## Related commands

‎components/cli/docs/reference/commandline/plugin_enable.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ but disabled:
2929
```bash
3030
$ docker plugin ls
3131

32-
ID NAME TAG DESCRIPTION ENABLED
33-
69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker false
32+
ID NAME DESCRIPTION ENABLED
33+
69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker false
3434
```
3535

3636
To enable the plugin, use the following command:
@@ -42,8 +42,8 @@ tiborvass/sample-volume-plugin
4242

4343
$ docker plugin ls
4444

45-
ID NAME TAG DESCRIPTION ENABLED
46-
69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker true
45+
ID NAME DESCRIPTION ENABLED
46+
69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker true
4747
```
4848

4949
## Related commands

‎components/cli/docs/reference/commandline/plugin_install.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ After the plugin is installed, it appears in the list of plugins:
4949
```bash
5050
$ docker plugin ls
5151

52-
ID NAME TAG DESCRIPTION ENABLED
53-
69553ca1d123 vieux/sshfs latest sshFS plugin for Docker true
52+
ID NAME DESCRIPTION ENABLED
53+
69553ca1d123 vieux/sshfs:latest sshFS plugin for Docker true
5454
```
5555

5656
## Related commands

‎components/cli/docs/reference/commandline/plugin_ls.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Refer to the [filtering](#filtering) section for more information about availabl
3434
```bash
3535
$ docker plugin ls
3636

37-
ID NAME TAG DESCRIPTION ENABLED
38-
69553ca1d123 tiborvass/sample-volume-plugin latest A test plugin for Docker true
37+
ID NAME DESCRIPTION ENABLED
38+
69553ca1d123 tiborvass/sample-volume-plugin:latest A test plugin for Docker true
3939
```
4040

4141
### Filtering
@@ -65,7 +65,7 @@ Installed plugin vieux/sshfs
6565

6666
$ docker plugin ls --filter enabled=true
6767

68-
NAME TAG DESCRIPTION ENABLED
68+
ID NAME DESCRIPTION ENABLED
6969
```
7070

7171
### Formatting
@@ -78,7 +78,7 @@ Valid placeholders for the Go template are listed below:
7878
Placeholder | Description
7979
-------------------|------------------------------------------------------------
8080
`.ID` | Plugin ID
81-
`.Name` | Plugin name
81+
`.Name` | Plugin name and tag
8282
`.Description` | Plugin description
8383
`.Enabled` | Whether plugin is enabled or not
8484
`.PluginReference` | The reference used to push/pull from a registry

‎components/cli/docs/reference/commandline/plugin_push.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ The following example shows how to push a sample `user/plugin`.
2929
```bash
3030
$ docker plugin ls
3131

32-
ID NAME TAG DESCRIPTION ENABLED
33-
69553ca1d456 user/plugin latest A sample plugin for Docker false
32+
ID NAME DESCRIPTION ENABLED
33+
69553ca1d456 user/plugin:latest A sample plugin for Docker false
3434

3535
$ docker plugin push user/plugin
3636
```

‎components/cli/docs/reference/commandline/stack_ps.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ tz6j82jnwrx7 voting_db.1 postgres:9.4
103103

104104
#### desired-state
105105

106-
The `desired-state` filter can take the values `running`, `shutdown`, or `accepted`.
106+
The `desired-state` filter can take the values `running`, `shutdown`, `ready` or `accepted`.
107107

108108
```bash
109109
$ docker stack ps -f "desired-state=running" voting

‎components/cli/vendor.conf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cloud.google.com/go 0ebda48a7f143b1cce9eb37a8c11
22
github.com/agl/ed25519 5312a61534124124185d41f09206b9fef1d88403
33
github.com/asaskevich/govalidator f9ffefc3facfbe0caee3fea233cbb6e8208f4541
44
github.com/Azure/go-ansiterm d6e3b3328b783f23731bc4d058875b0371ff8109
5-
github.com/beorn7/perks e7f67b54abbeac9c40a31de0f81159e4cafebd6a
5+
github.com/beorn7/perks 37c8de3658fcb183f997c4e13e8337516ab753e6 # v1.0.1
66
github.com/containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
77
github.com/containerd/containerd 3a3f0aac8819165839a41fee77a4f4ac8b103097
88
github.com/containerd/continuity aaeac12a7ffcd198ae25440a9dff125c2e2703a7
@@ -45,14 +45,14 @@ github.com/imdario/mergo 7c29201646fa3de8506f70121347
4545
github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 # v1.0.0
4646
github.com/jaguilar/vt100 ad4c4a5743050fb7f88ce968dca9422f72a0e3f2 git://github.com/tonistiigi/vt100.git
4747
github.com/json-iterator/go 0ff49de124c6f76f8494e194af75bde0f1a49a29 # 1.1.6
48-
github.com/konsorten/go-windows-terminal-sequences f55edac94c9bbba5d6182a4be46d86a2c9b5b50e # v1.0.2
48+
github.com/konsorten/go-windows-terminal-sequences edb144dfd453055e1e49a3d8b410a660b5a87613 # v1.0.3
4949
github.com/kr/pty 521317be5ebc228a0f0ede099fa2a0b5ece22e49 # v1.1.4
5050
github.com/mattn/go-shellwords a72fbe27a1b0ed0df2f02754945044ce1456608b # v1.0.5
5151
github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c # v1.0.1
5252
github.com/Microsoft/go-winio 84b4ab48a50763fe7b3abcef38e5205c12027fac
5353
github.com/Microsoft/hcsshim 672e52e9209d1e53718c1b6a7d68cc9272654ab5
5454
github.com/miekg/pkcs11 cb39313ec884f2cd77f4762875fe96aecf68f8e3 # v1.0.2
55-
github.com/mitchellh/mapstructure f15292f7a699fcc1a38a80977f80a046874ba8ac
55+
github.com/mitchellh/mapstructure fa473d140ef3c6adf42d6b391fe76707f1f243c8 # v1.0.0
5656
github.com/moby/buildkit ae10b292fefb00e0fbf9fecd1419c5f252e58895
5757
github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3
5858
github.com/modern-go/reflect2 4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd # 1.0.1

‎components/cli/vendor/github.com/beorn7/perks/go.mod‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/cli/vendor/github.com/konsorten/go-windows-terminal-sequences/README.md‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)