From b4306588e982481c46708c535d5bfc5efdbd4cd8 Mon Sep 17 00:00:00 2001 From: yuexiao-wang Date: Tue, 29 Nov 2016 23:44:12 +0800 Subject: [PATCH] Fix the inconsistency for docker secret Signed-off-by: yuexiao-wang --- cli/command/secret/inspect.go | 2 +- cli/command/secret/ls.go | 7 ++++--- cli/command/secret/remove.go | 7 ++++--- docs/reference/commandline/secret_ls.md | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cli/command/secret/inspect.go b/cli/command/secret/inspect.go index 1dda6f7838..0a8bd4a23f 100644 --- a/cli/command/secret/inspect.go +++ b/cli/command/secret/inspect.go @@ -25,7 +25,7 @@ func newSecretInspectCommand(dockerCli *command.DockerCli) *cobra.Command { }, } - cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template") + cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template") return cmd } diff --git a/cli/command/secret/ls.go b/cli/command/secret/ls.go index d96b377867..faeab314b7 100644 --- a/cli/command/secret/ls.go +++ b/cli/command/secret/ls.go @@ -21,9 +21,10 @@ func newSecretListCommand(dockerCli *command.DockerCli) *cobra.Command { opts := listOptions{} cmd := &cobra.Command{ - Use: "ls [OPTIONS]", - Short: "List secrets", - Args: cli.NoArgs, + Use: "ls [OPTIONS]", + Aliases: []string{"list"}, + Short: "List secrets", + Args: cli.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { return runSecretList(dockerCli, opts) }, diff --git a/cli/command/secret/remove.go b/cli/command/secret/remove.go index 5026a437f8..41651a16b8 100644 --- a/cli/command/secret/remove.go +++ b/cli/command/secret/remove.go @@ -15,9 +15,10 @@ type removeOptions struct { func newSecretRemoveCommand(dockerCli *command.DockerCli) *cobra.Command { return &cobra.Command{ - Use: "rm SECRET [SECRET...]", - Short: "Remove one or more secrets", - Args: cli.RequiresMinArgs(1), + Use: "rm SECRET [SECRET...]", + Aliases: []string{"remove"}, + Short: "Remove one or more secrets", + Args: cli.RequiresMinArgs(1), RunE: func(cmd *cobra.Command, args []string) error { opts := removeOptions{ names: args, diff --git a/docs/reference/commandline/secret_ls.md b/docs/reference/commandline/secret_ls.md index 31659e72e6..6b34fc2146 100644 --- a/docs/reference/commandline/secret_ls.md +++ b/docs/reference/commandline/secret_ls.md @@ -27,9 +27,9 @@ Options: -q, --quiet Only display IDs ``` -Run this command from a manager to list the secrets in the Swarm. +Run this command on a manager node to list the secrets in the Swarm. -On a manager node: +## Examples ```bash $ docker secret ls