From 76dae42c925d2c06cad149daee62132d36e8d85f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 20 Jul 2016 15:52:43 +0200 Subject: [PATCH] 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 Upstream-commit: 06f35262c47629fef78e36daaa2742c2c0d7c3a9 Component: engine --- components/engine/api/client/stack/opts.go | 4 ++-- components/engine/docs/reference/commandline/deploy.md | 2 +- components/engine/docs/reference/commandline/stack_config.md | 2 +- components/engine/docs/reference/commandline/stack_deploy.md | 2 +- components/engine/experimental/docker-stacks-and-bundles.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/engine/api/client/stack/opts.go b/components/engine/api/client/stack/opts.go index 8a1624cfc5..f13732efbe 100644 --- a/components/engine/api/client/stack/opts.go +++ b/components/engine/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/components/engine/docs/reference/commandline/deploy.md b/components/engine/docs/reference/commandline/deploy.md index 34d39c5061..59314e4a8d 100644 --- a/components/engine/docs/reference/commandline/deploy.md +++ b/components/engine/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/components/engine/docs/reference/commandline/stack_config.md b/components/engine/docs/reference/commandline/stack_config.md index c9292bd686..ba990aea98 100644 --- a/components/engine/docs/reference/commandline/stack_config.md +++ b/components/engine/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/components/engine/docs/reference/commandline/stack_deploy.md b/components/engine/docs/reference/commandline/stack_deploy.md index a519b5b67e..541882e2ac 100644 --- a/components/engine/docs/reference/commandline/stack_deploy.md +++ b/components/engine/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/components/engine/experimental/docker-stacks-and-bundles.md b/components/engine/experimental/docker-stacks-and-bundles.md index 1da2b8f587..93e92fe2f1 100644 --- a/components/engine/experimental/docker-stacks-and-bundles.md +++ b/components/engine/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 ```