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

Merge pull request #1222 from thaJeztah/its_not_standard_but_its_in 

Update --compose-file flag description to mention stdin
This commit is contained in:
Silvin 2018-07-30 16:23:29 +02:00 committed by GitHub
parent ed335aba8c 2c7822b036
commit 6cd0e2fe70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/stack/deploy.go
View File

@ -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.StringVar(&opts.Bundlefile, "bundle-file", "", "Path to a Distributed Application Bundle file")
flags.SetAnnotation("bundle-file", "experimental", nil) flags.SetAnnotation("bundle-file", "experimental", nil)
flags.SetAnnotation("bundle-file", "swarm", 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.SetAnnotation("compose-file", "version", []string{"1.25"})
flags.BoolVar(&opts.SendRegistryAuth, "with-registry-auth", false, "Send registry authentication details to Swarm agents") flags.BoolVar(&opts.SendRegistryAuth, "with-registry-auth", false, "Send registry authentication details to Swarm agents")
flags.SetAnnotation("with-registry-auth", "swarm", nil) flags.SetAnnotation("with-registry-auth", "swarm", nil)

2
contrib/completion/zsh/_docker
View File

@ -2214,7 +2214,7 @@ __docker_stack_subcommand() {
_arguments $(__docker_arguments) \ _arguments $(__docker_arguments) \
$opts_help \ $opts_help \
"($help)--bundle-file=[Path to a Distributed Application Bundle file]:dab:_files -g \"*.dab\"" \ "($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)--with-registry-auth[Send registry authentication details to Swarm agents]" \
"($help -):stack:__docker_complete_stacks" && ret=0 "($help -):stack:__docker_complete_stacks" && ret=0
;; ;;

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

@ -28,7 +28,7 @@ Aliases:
Options: Options:
--bundle-file string Path to a Distributed Application Bundle file --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 --help Print usage
--prune Prune services that are no longer referenced --prune Prune services that are no longer referenced
--with-registry-auth Send registry authentication details to Swarm agents --with-registry-auth Send registry authentication details to Swarm agents

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

@ -25,7 +25,7 @@ Aliases:
Options: Options:
--bundle-file string Path to a Distributed Application Bundle file --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 --help Print usage
--kubeconfig string Kubernetes config file --kubeconfig string Kubernetes config file
--namespace string Kubernetes namespace to use --namespace string Kubernetes namespace to use