From 2c7822b0361dd3e78bb0745a5c03f741bc21821e Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 19 Jul 2018 14:55:48 +0200 Subject: [PATCH] Update --compose-file flag description to mention stdin Signed-off-by: Sebastiaan van Stijn --- cli/command/stack/deploy.go | 2 +- contrib/completion/zsh/_docker | 2 +- docs/reference/commandline/deploy.md | 2 +- docs/reference/commandline/stack_deploy.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/command/stack/deploy.go b/cli/command/stack/deploy.go index 0165bbda1a..6c083eb2fb 100644 --- a/cli/command/stack/deploy.go +++ b/cli/command/stack/deploy.go @@ -58,7 +58,7 @@ func newDeployCommand(dockerCli command.Cli, common *commonOptions) *cobra.Comma flags.StringVar(&opts.Bundlefile, "bundle-file", "", "Path to a Distributed Application Bundle file") flags.SetAnnotation("bundle-file", "experimental", nil) flags.SetAnnotation("bundle-file", "swarm", nil) - flags.StringSliceVarP(&opts.Composefiles, "compose-file", "c", []string{}, "Path to a Compose file") + flags.StringSliceVarP(&opts.Composefiles, "compose-file", "c", []string{}, `Path to a Compose file, or "-" to read from stdin`) flags.SetAnnotation("compose-file", "version", []string{"1.25"}) flags.BoolVar(&opts.SendRegistryAuth, "with-registry-auth", false, "Send registry authentication details to Swarm agents") flags.SetAnnotation("with-registry-auth", "swarm", nil) diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index 32ad4848a2..917ce6b114 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -2209,7 +2209,7 @@ __docker_stack_subcommand() { _arguments $(__docker_arguments) \ $opts_help \ "($help)--bundle-file=[Path to a Distributed Application Bundle file]:dab:_files -g \"*.dab\"" \ - "($help -c --compose-file)"{-c=,--compose-file=}"[Path to a Compose file]:compose file:_files -g \"*.(yml|yaml)\"" \ + "($help -c --compose-file)"{-c=,--compose-file=}"[Path to a Compose file, or '-' to read from stdin]:compose file:_files -g \"*.(yml|yaml)\"" \ "($help)--with-registry-auth[Send registry authentication details to Swarm agents]" \ "($help -):stack:__docker_complete_stacks" && ret=0 ;; diff --git a/docs/reference/commandline/deploy.md b/docs/reference/commandline/deploy.md index af08bfe52c..e31a3858c6 100644 --- a/docs/reference/commandline/deploy.md +++ b/docs/reference/commandline/deploy.md @@ -28,7 +28,7 @@ Aliases: Options: --bundle-file string Path to a Distributed Application Bundle file - --compose-file string Path to a Compose file + --compose-file string Path to a Compose file, or "-" to read from stdin --help Print usage --prune Prune services that are no longer referenced --with-registry-auth Send registry authentication details to Swarm agents diff --git a/docs/reference/commandline/stack_deploy.md b/docs/reference/commandline/stack_deploy.md index 8f7687bce8..9542973aeb 100644 --- a/docs/reference/commandline/stack_deploy.md +++ b/docs/reference/commandline/stack_deploy.md @@ -25,7 +25,7 @@ Aliases: Options: --bundle-file string Path to a Distributed Application Bundle file - -c, --compose-file strings Path to a Compose file + -c, --compose-file strings Path to a Compose file, or "-" to read from stdin --help Print usage --kubeconfig string Kubernetes config file --namespace string Kubernetes namespace to use