Rename --bundle to --file

This renames the '--bundle' flag for docker (stack) deploy to be consistent with 'docker build'. Note that there's no shorthand '-f' added for now, because this may be confusing on 'docker stack config', which also takes a file, and for which we may want to have a '--format' flag in future. Signed-off-by: Sebastiaan van Stijn <[email protected]> (cherry picked from commit 06f3526) Signed-off-by: Tibor Vass <[email protected]>
alexmavr · Jul 26, 2016 · 33ff331 · 33ff331
1 parent fd7cabe
commit 33ff331
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/api/client/stack/opts.go b/api/client/stack/opts.go
@@ -14,7 +14,7 @@ import (
 func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
 	flags.StringVar(
 		opt,
-		"bundle", "",
+		"file", "",
 		"Path to a Distributed Application Bundle file (Default: STACK.dab)")
 }
 
@@ -26,7 +26,7 @@ func loadBundlefile(stderr io.Writer, namespace string, path string) (*bundlefil
 	}
 	if _, err := os.Stat(path); err != nil {
 		return nil, fmt.Errorf(
-			"Bundle %s not found. Specify the path with -f or --bundle",
+			"Bundle %s not found. Specify the path with --file",
 			path)
 	}
 

diff --git a/docs/reference/commandline/deploy.md b/docs/reference/commandline/deploy.md
@@ -17,7 +17,7 @@ Usage:  docker deploy [OPTIONS] STACK
 Create and update a stack from a Distributed Application Bundle (DAB)
 
 Options:
-      --bundle string   Path to a Distributed Application Bundle file (Default: STACK.dab)
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
       --help            Print usage
 ```
 

diff --git a/docs/reference/commandline/stack_config.md b/docs/reference/commandline/stack_config.md
@@ -17,7 +17,7 @@ Usage:  docker stack config [OPTIONS] STACK
 Print the stack configuration
 
 Options:
-      --bundle string   Path to a Distributed Application Bundle file (Default: STACK.dab)
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
       --help            Print usage
 ```
 

diff --git a/docs/reference/commandline/stack_deploy.md b/docs/reference/commandline/stack_deploy.md
@@ -20,7 +20,7 @@ Aliases:
   deploy, up
 
 Options:
-      --bundle string   Path to a Distributed Application Bundle file (Default: STACK.dab)
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
       --help            Print usage
 ```
 

diff --git a/experimental/docker-stacks-and-bundles.md b/experimental/docker-stacks-and-bundles.md
@@ -44,7 +44,7 @@ Usage:  docker deploy [OPTIONS] STACK
 Create and update a stack
 
 Options:
-  -f, --bundle string   Path to a bundle (Default: STACK.dab)
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
       --help            Print usage
 ```