From 9ec67fd8d144a9a769159f7d496962d278d2712b Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Fri, 22 Jul 2016 10:38:56 +0200 Subject: [PATCH] Append --registry-auth with with `--with-registry-auth` is more explicit. Signed-off-by: Vincent Demeester (cherry picked from commit 8426f72107f351b769babadeabbf13f205126514) Signed-off-by: Tibor Vass --- api/client/service/opts.go | 2 +- api/client/stack/opts.go | 2 +- contrib/completion/bash/docker | 2 +- contrib/completion/zsh/_docker | 2 +- docs/reference/commandline/deploy.md | 6 +++--- docs/reference/commandline/service_create.md | 2 +- docs/reference/commandline/service_update.md | 2 +- experimental/docker-stacks-and-bundles.md | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/client/service/opts.go b/api/client/service/opts.go index 3391211e1b..cb58d6d130 100644 --- a/api/client/service/opts.go +++ b/api/client/service/opts.go @@ -547,7 +547,7 @@ const ( flagUpdateDelay = "update-delay" flagUpdateParallelism = "update-parallelism" flagUser = "user" - flagRegistryAuth = "registry-auth" + flagRegistryAuth = "with-registry-auth" flagLogDriver = "log-driver" flagLogOpt = "log-opt" ) diff --git a/api/client/stack/opts.go b/api/client/stack/opts.go index 3c508f765a..345bdc38f5 100644 --- a/api/client/stack/opts.go +++ b/api/client/stack/opts.go @@ -19,7 +19,7 @@ func addBundlefileFlag(opt *string, flags *pflag.FlagSet) { } func addRegistryAuthFlag(opt *bool, flags *pflag.FlagSet) { - flags.BoolVar(opt, "registry-auth", false, "Send registry authentication details to Swarm agents") + flags.BoolVar(opt, "with-registry-auth", false, "Send registry authentication details to Swarm agents") } func loadBundlefile(stderr io.Writer, namespace string, path string) (*bundlefile.Bundlefile, error) { diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 8c4f6a9114..6711f9c573 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -1733,7 +1733,7 @@ _docker_service_update() { local boolean_options=" --help - --registry-auth + --with-registry-auth " __docker_complete_log_driver_options && return diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index a031620fe0..25e973910c 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -1086,7 +1086,6 @@ __docker_service_subcommand() { "($help)--name=[Service name]:name: " "($help)*--network=[Network attachments]:network: " "($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: " - "($help)--registry-auth[Send registry authentication details to swarm agents]" "($help)--replicas=[Number of tasks]:replicas: " "($help)--reserve-cpu=[Reserve CPUs]:value: " "($help)--reserve-memory=[Reserve Memory]:value: " @@ -1098,6 +1097,7 @@ __docker_service_subcommand() { "($help)--update-delay=[Delay between updates]:delay: " "($help)--update-parallelism=[Maximum number of tasks updated simultaneously]:number: " "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" + "($help)--with-registry-auth[Send registry authentication details to swarm agents]" "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories" ) diff --git a/docs/reference/commandline/deploy.md b/docs/reference/commandline/deploy.md index c18a8f58bb..908131e4bb 100644 --- a/docs/reference/commandline/deploy.md +++ b/docs/reference/commandline/deploy.md @@ -17,9 +17,9 @@ Usage: docker deploy [OPTIONS] STACK Create and update a stack from a Distributed Application Bundle (DAB) Options: - --file string Path to a Distributed Application Bundle file (Default: STACK.dab) - --help Print usage - --registry-auth Send registry authentication details to swarm agents + --file string Path to a Distributed Application Bundle file (Default: STACK.dab) + --help Print usage + --with-registry-auth Send registry authentication details to swarm agents ``` Create and update a stack from a `dab` file. This command has to be diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md index e62c0f7379..550f1f9b97 100644 --- a/docs/reference/commandline/service_create.md +++ b/docs/reference/commandline/service_create.md @@ -33,7 +33,6 @@ Options: --name string Service name --network value Network attachments (default []) -p, --publish value Publish a port as a node port (default []) - --registry-auth Send registry authentication details to swarm agents --replicas value Number of tasks (default none) --reserve-cpu value Reserve CPUs (default 0.000) --reserve-memory value Reserve Memory (default 0 B) @@ -45,6 +44,7 @@ Options: --update-delay duration Delay between updates --update-parallelism uint Maximum number of tasks updated simultaneously -u, --user string Username or UID + --with-registry-auth Send registry authentication details to Swarm agents -w, --workdir string Working directory inside the container ``` diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md index 059b6bc11a..0044d024bf 100644 --- a/docs/reference/commandline/service_update.md +++ b/docs/reference/commandline/service_update.md @@ -39,7 +39,6 @@ Options: --network-rm value Remove a network by name (default []) --publish-add value Add or update a published port (default []) --publish-rm value Remove a published port by its target port (default []) - --registry-auth Send registry authentication details to swarm agents --replicas value Number of tasks (default none) --reserve-cpu value Reserve CPUs (default 0.000) --reserve-memory value Reserve Memory (default 0 B) @@ -51,6 +50,7 @@ Options: --update-delay duration Delay between updates --update-parallelism uint Maximum number of tasks updated simultaneously -u, --user string Username or UID + --with-registry-auth Send registry authentication details to Swarm agents -w, --workdir string Working directory inside the container ``` diff --git a/experimental/docker-stacks-and-bundles.md b/experimental/docker-stacks-and-bundles.md index 0f1d00c434..d685a3959d 100644 --- a/experimental/docker-stacks-and-bundles.md +++ b/experimental/docker-stacks-and-bundles.md @@ -44,9 +44,9 @@ Usage: docker deploy [OPTIONS] STACK Create and update a stack Options: - --file string Path to a Distributed Application Bundle file (Default: STACK.dab) - --help Print usage - --registry-auth Send registry authentication details to Swarm agents + --file string Path to a Distributed Application Bundle file (Default: STACK.dab) + --help Print usage + --with-registry-auth Send registry authentication details to Swarm agents ``` Let's deploy the stack created before: