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

Merge pull request #28922 from yuexiao-wang/fix-secret 

Fix the inconsistency for secret ls and secrect rm
This commit is contained in:
Sebastiaan van Stijn 2016-12-01 11:29:58 +01:00 committed by GitHub
parent cd79095c81 7a9e414988
commit ebd8ec6c3f
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/secret/inspect.go
View File

@ -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 return cmd
} }

7
command/secret/ls.go
View File

@ -21,9 +21,10 @@ func newSecretListCommand(dockerCli *command.DockerCli) *cobra.Command {
opts := listOptions{} opts := listOptions{}
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "ls [OPTIONS]", Use: "ls [OPTIONS]",
Short: "List secrets", Aliases: []string{"list"},
Args: cli.NoArgs, Short: "List secrets",
Args: cli.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return runSecretList(dockerCli, opts) return runSecretList(dockerCli, opts)
}, },

7
command/secret/remove.go
View File

@ -16,9 +16,10 @@ type removeOptions struct {
func newSecretRemoveCommand(dockerCli *command.DockerCli) *cobra.Command { func newSecretRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
return &cobra.Command{ return &cobra.Command{
Use: "rm SECRET [SECRET...]", Use: "rm SECRET [SECRET...]",
Short: "Remove one or more secrets", Aliases: []string{"remove"},
Args: cli.RequiresMinArgs(1), Short: "Remove one or more secrets",
Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
opts := removeOptions{ opts := removeOptions{
names: args, names: args,