1. docker
  2. Commit 95398c33ccf9951effb8797639a8e5ece159cc0c
Browse code

Move docker stack out of experimental

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 6df5baf30f96e5af3338551b9e632748d7886ead)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

Daniel Nephin authored on 2016/11/22 05:30:25
Showing 3 changed files
cli/command/stack/cmd.go
History View file @ 95398c3
... ... 
@@ -13,7 +13,7 @@ func NewStackCommand(dockerCli *command.DockerCli) *cobra.Command {
13 13 
 		Short: "Manage Docker stacks",
14 14 
 		Args:  cli.NoArgs,
15 15 
 		RunE:  dockerCli.ShowHelp,
16 
-		Tags:  map[string]string{"experimental": "", "version": "1.25"},
16 
+		Tags:  map[string]string{"version": "1.25"},
17 17 
 	}
18 18 
 	cmd.AddCommand(
19 19 
 		newDeployCommand(dockerCli),
... ... 
@@ -30,5 +30,6 @@ func NewTopLevelDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
30 30 
 	cmd := newDeployCommand(dockerCli)
31 31 
 	// Remove the aliases at the top level
32 32 
 	cmd.Aliases = []string{}
33 
+	cmd.Tags = map[string]string{"experimental": "", "version": "1.25"}
33 34 
 	return cmd
34 35 
 }
cli/command/stack/deploy.go
History View file @ 95398c3
... ... 
@@ -49,7 +49,6 @@ func newDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
49 49 
 			opts.namespace = args[0]
50 50 
 			return runDeploy(dockerCli, opts)
51 51 
 		},
52 
-		Tags: map[string]string{"experimental": "", "version": "1.25"},
53 52 
 	}
54 53
55 54 
 	flags := cmd.Flags()
cli/command/stack/opts.go
History View file @ 95398c3
... ... 
@@ -15,6 +15,7 @@ func addComposefileFlag(opt *string, flags *pflag.FlagSet) {
15 15
16 16 
 func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
17 17 
 	flags.StringVar(opt, "bundle-file", "", "Path to a Distributed Application Bundle file")
18 
+	flags.SetAnnotation("bundle-file", "experimental", nil)
18 19 
 }
19 20
20 21 
 func addRegistryAuthFlag(opt *bool, flags *pflag.FlagSet) {