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

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>
This commit is contained in:
Sebastiaan van Stijn 2016-07-20 15:52:43 +02:00 committed by Tibor Vass
parent fd7cabed36
commit 33ff331ad7
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/client/stack/opts.go
View File

@ -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)
} }

2
docs/reference/commandline/deploy.md
View File

@ -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
``` ```

2
docs/reference/commandline/stack_config.md
View File

@ -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
``` ```

2
docs/reference/commandline/stack_deploy.md
View File

@ -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
``` ```

2
experimental/docker-stacks-and-bundles.md
View File

@ -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
``` ```