From 8d43f5593a113b87e3f9d15b2eedf2b073812378 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 17 Jan 2017 15:46:07 +0100 Subject: [PATCH] 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 --- docs/reference/commandline/plugin_push.md | 5 +++-- docs/reference/commandline/push.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/reference/commandline/plugin_push.md b/docs/reference/commandline/plugin_push.md index 2747f4c4a9..693dc3a130 100644 --- a/docs/reference/commandline/plugin_push.md +++ b/docs/reference/commandline/plugin_push.md @@ -14,12 +14,13 @@ keywords: "plugin, push" --> ```markdown -Usage: docker plugin push PLUGIN[:TAG] +Usage: docker plugin push PLUGIN[:TAG] Push a plugin to a registry Options: - --help Print usage + --disable-content-trust Skip image signing (default true) + --help Print usage ``` Use `docker plugin create` to create the plugin. Once the plugin is ready for distribution, diff --git a/docs/reference/commandline/push.md b/docs/reference/commandline/push.md index e36fd026d1..33cc399767 100644 --- a/docs/reference/commandline/push.md +++ b/docs/reference/commandline/push.md @@ -21,7 +21,7 @@ Usage: docker push [OPTIONS] NAME[:TAG] Push an image or a repository to a registry Options: - --disable-content-trust Skip image verification (default true) + --disable-content-trust Skip image signing (default true) --help Print usage ```