1. docker
  2. Commit 33ff331ad7fa097fb82a3cd558a7a98b14d83f0f
Browse code

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>
(cherry picked from commit 06f35262c47629fef78e36daaa2742c2c0d7c3a9)
Signed-off-by: Tibor Vass <tibor@docker.com>

Sebastiaan van Stijn authored on 2016/07/20 22:52:43
Showing 5 changed files
api/client/stack/opts.go
History View file @ 33ff331
... ... 
@@ -14,7 +14,7 @@ import (
14 14 
 func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
15 15 
 	flags.StringVar(
16 16 
 		opt,
17 
-		"bundle", "",
17 
+		"file", "",
18 18 
 		"Path to a Distributed Application Bundle file (Default: STACK.dab)")
19 19 
 }
20 20
... ... 
@@ -26,7 +26,7 @@ func loadBundlefile(stderr io.Writer, namespace string, path string) (*bundlefil
26 26 
 	}
27 27 
 	if _, err := os.Stat(path); err != nil {
28 28 
 		return nil, fmt.Errorf(
29 
-			"Bundle %s not found. Specify the path with -f or --bundle",
29 
+			"Bundle %s not found. Specify the path with --file",
30 30 
 			path)
31 31 
 	}
32 32
docs/reference/commandline/deploy.md
History View file @ 33ff331
... ... 
@@ -17,7 +17,7 @@ Usage:  docker deploy [OPTIONS] STACK
17 17 
 Create and update a stack from a Distributed Application Bundle (DAB)
18 18
19 19 
 Options:
20 
-      --bundle string   Path to a Distributed Application Bundle file (Default: STACK.dab)
20 
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
21 21 
       --help            Print usage
22 22 
 ```
23 23
docs/reference/commandline/stack_config.md
History View file @ 33ff331
... ... 
@@ -17,7 +17,7 @@ Usage:  docker stack config [OPTIONS] STACK
17 17 
 Print the stack configuration
18 18
19 19 
 Options:
20 
-      --bundle string   Path to a Distributed Application Bundle file (Default: STACK.dab)
20 
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
21 21 
       --help            Print usage
22 22 
 ```
23 23
docs/reference/commandline/stack_deploy.md
History View file @ 33ff331
... ... 
@@ -20,7 +20,7 @@ Aliases:
20 20 
   deploy, up
21 21
22 22 
 Options:
23 
-      --bundle string   Path to a Distributed Application Bundle file (Default: STACK.dab)
23 
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
24 24 
       --help            Print usage
25 25 
 ```
26 26
experimental/docker-stacks-and-bundles.md
History View file @ 33ff331
... ... 
@@ -44,7 +44,7 @@ Usage:  docker deploy [OPTIONS] STACK
44 44 
 Create and update a stack
45 45
46 46 
 Options:
47 
-  -f, --bundle string   Path to a bundle (Default: STACK.dab)
47 
+      --file   string   Path to a Distributed Application Bundle file (Default: STACK.dab)
48 48 
       --help            Print usage
49 49 
 ```
50 50