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

Merge pull request #28677 from dnephin/remove-deploy-experimental 

Move `docker stack` out of experimental
This commit is contained in:
Victor Vieux 2016-11-21 14:33:35 -08:00 committed by GitHub
parent 07c896b18e e1b5bdd768
commit 23c399dd10
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command/stack/cmd.go
View File

@ -13,7 +13,7 @@ func NewStackCommand(dockerCli *command.DockerCli) *cobra.Command {
Short: "Manage Docker stacks", Short: "Manage Docker stacks",
Args: cli.NoArgs, Args: cli.NoArgs,
RunE: dockerCli.ShowHelp, RunE: dockerCli.ShowHelp,
Tags: map[string]string{"experimental": "", "version": "1.25"}, Tags: map[string]string{"version": "1.25"},
} }
cmd.AddCommand( cmd.AddCommand(
newDeployCommand(dockerCli), newDeployCommand(dockerCli),
@ -30,5 +30,6 @@ func NewTopLevelDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
cmd := newDeployCommand(dockerCli) cmd := newDeployCommand(dockerCli)
// Remove the aliases at the top level // Remove the aliases at the top level
cmd.Aliases = []string{} cmd.Aliases = []string{}
cmd.Tags = map[string]string{"experimental": "", "version": "1.25"}
return cmd return cmd
} }

1
command/stack/deploy.go
View File

@ -49,7 +49,6 @@ func newDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
opts.namespace = args[0] opts.namespace = args[0]
return runDeploy(dockerCli, opts) return runDeploy(dockerCli, opts)
}, },
Tags: map[string]string{"experimental": "", "version": "1.25"},
} }
flags := cmd.Flags() flags := cmd.Flags()

1
command/stack/opts.go
View File

@ -15,6 +15,7 @@ func addComposefileFlag(opt *string, flags *pflag.FlagSet) {
func addBundlefileFlag(opt *string, flags *pflag.FlagSet) { func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
flags.StringVar(opt, "bundle-file", "", "Path to a Distributed Application Bundle file") flags.StringVar(opt, "bundle-file", "", "Path to a Distributed Application Bundle file")
flags.SetAnnotation("bundle-file", "experimental", nil)
} }
func addRegistryAuthFlag(opt *bool, flags *pflag.FlagSet) { func addRegistryAuthFlag(opt *bool, flags *pflag.FlagSet) {