Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix flag descriptions for content-trust 

Commit ed13c3abfb242905ec012e8255dc6f26dcf122f6 added flags
for Docker Content Trust. Depending on the `verify` boolean,
the message is "Skip image verification", or "Skip image signing".
"Signing" is intended for `docker push` / `docker plugin push`.

During the migration to Cobra, this boolean got flipped for
`docker push` (9640e3a4514f96a890310757a09fd77a3c70e931),
causing `docker push` to show the incorrect flag description.

This patch changes the flags to use the correct description
for `docker push`, and `docker plugin push`.

To prevent this confusion in future, the boolean argument
is removed, and a `AddTrustSigningFlags()` function is added.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2017-01-17 15:46:07 +01:00 committed by Tibor Vass
parent f7efcbbaa1
commit 8d43f5593a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/commandline/plugin_push.md
View File

@ -19,6 +19,7 @@ Usage: docker plugin push PLUGIN[:TAG]
Push a plugin to a registry Push a plugin to a registry
Options: Options:
--disable-content-trust Skip image signing (default true)
--help Print usage --help Print usage
``` ```

2
docs/reference/commandline/push.md
View File

@ -21,7 +21,7 @@ Usage: docker push [OPTIONS] NAME[:TAG]
Push an image or a repository to a registry Push an image or a repository to a registry
Options: Options:
--disable-content-trust Skip image verification (default true) --disable-content-trust Skip image signing (default true)
--help Print usage --help Print usage
``` ```