Skip to content

Commit

Permalink
Append --registry-auth with with
Browse files Browse the repository at this point in the history
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <[email protected]>
  • Loading branch information
vdemeester authored and Tibor Vass committed Jun 2, 2017
1 parent 6eef413 commit 2f9e9bc
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion contrib/completion/bash/docker
Original file line number Diff line number Diff line change
Expand Up @@ -1733,7 +1733,7 @@ _docker_service_update() {

local boolean_options="
--help
--registry-auth
--with-registry-auth
"

__docker_complete_log_driver_options && return
Expand Down
2 changes: 1 addition & 1 deletion contrib/completion/zsh/_docker
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,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: "
Expand All @@ -1097,6 +1096,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"
)

Expand Down
6 changes: 3 additions & 3 deletions docs/reference/commandline/deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/commandline/service_create.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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)
Expand All @@ -43,6 +42,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
```

Expand Down
2 changes: 1 addition & 1 deletion docs/reference/commandline/service_update.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,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)
Expand All @@ -50,6 +49,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
```

Expand Down
6 changes: 3 additions & 3 deletions experimental/docker-stacks-and-bundles.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 2f9e9bc

Please sign in to comment.