瀏覽代碼

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 <github@gone.nl>
Sebastiaan van Stijn 9 年之前
父節點
當前提交
06f35262c4

+ 2 - 2
api/client/stack/opts.go

@@ -14,7 +14,7 @@ import (
 func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
 func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
 	flags.StringVar(
 	flags.StringVar(
 		opt,
 		opt,
-		"bundle", "",
+		"file", "",
 		"Path to a Distributed Application Bundle file (Default: STACK.dab)")
 		"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 {
 	if _, err := os.Stat(path); err != nil {
 		return nil, fmt.Errorf(
 		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)
 			path)
 	}
 	}
 
 

+ 1 - 1
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)
 Create and update a stack from a Distributed Application Bundle (DAB)
 
 
 Options:
 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
       --help            Print usage
 ```
 ```
 
 

+ 1 - 1
docs/reference/commandline/stack_config.md

@@ -17,7 +17,7 @@ Usage:  docker stack config [OPTIONS] STACK
 Print the stack configuration
 Print the stack configuration
 
 
 Options:
 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
       --help            Print usage
 ```
 ```
 
 

+ 1 - 1
docs/reference/commandline/stack_deploy.md

@@ -20,7 +20,7 @@ Aliases:
   deploy, up
   deploy, up
 
 
 Options:
 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
       --help            Print usage
 ```
 ```
 
 

+ 1 - 1
experimental/docker-stacks-and-bundles.md

@@ -44,7 +44,7 @@ Usage:  docker deploy [OPTIONS] STACK
 Create and update a stack
 Create and update a stack
 
 
 Options:
 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
       --help            Print usage
 ```
 ```