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
commit ebd8ec6c3f
3 changed files with 9 additions and 7 deletions

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
}

View File

@ -22,6 +22,7 @@ func newSecretListCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := &cobra.Command{
Use: "ls [OPTIONS]",
Aliases: []string{"list"},
Short: "List secrets",
Args: cli.NoArgs,
RunE: func(cmd *cobra.Command, args []string) error {

View File

@ -17,6 +17,7 @@ type removeOptions struct {
func newSecretRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
return &cobra.Command{
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 {