Commit graph

66 commits

Author SHA1 Message Date
Aaron Lehmann
933ba8d7f7 Update --update-parallelism docs
Update documentation to account for the changes in #24952.

docs/swarm/swarm-tutorial/rolling-update.md doesn't need any changes,
but the CLI reference pages should show the current help text.
drain-node.md no longer needs to specify --update-parallelism 1 in its
example.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-22 19:07:10 -07:00
Vincent Demeester
8426f72107
Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-22 10:38:56 +02:00
Aaron Lehmann
2cc5bd33ee Replace secrets with join tokens
Implement the proposal from
https://github.com/docker/docker/issues/24430#issuecomment-233100121

Removes acceptance policy and secret in favor of an automatically
generated join token that combines the secret, CA hash, and
manager/worker role into a single opaque string.

Adds a docker swarm join-token subcommand to inspect and rotate the
tokens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-21 15:23:03 -07:00
Sebastiaan van Stijn
5ece2a6e0d
Add missing --log-driver and --log-opt docs
Adds documentation for "--log-driver" and "--log-opt"
for services.

Also updated the API docs to include the new
options, and generated a more complete JSON
example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-20 14:55:26 +02:00
Charles Smith
9594ac97ce add ref docs for node label
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-19 15:41:00 -07:00
Anil Madhavapeddy
c37da1792d docs: correct the placement constraints docker service example
- the constraint expression needs to be quoted
- add an actual redis container to run so the command line works

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
2016-07-14 17:38:37 +01:00
Sebastiaan van Stijn
7bf0faf423
Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 18:47:29 +02:00
Charles Smith
093817031a add constraint to service create ref
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-07 18:25:37 -07:00
Sebastiaan van Stijn
b98ba9a1d6 Merge pull request #24291 from vdemeester/docs-cli-reference-updates
Updates on cli reference documentation
2016-07-07 14:28:54 -07:00
Vincent Demeester
f4cfc6b983
Updates on cli reference documentation
- Update ps with `--last` flag
- Update commands with current output
- Make sure hugo does not detect the wrong language
- Update usage for `tag` command to be more coherent with the other ones

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-07 20:43:18 +02:00
Vincent Demeester
a859a33647
Use "on-failure" for both containers and services
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-07 11:32:19 +02:00
Anil Madhavapeddy
2de9585f5e make docker service --help text for --endpoint-mode more consistent
Previously:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode(Valid values: vip, dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Now:

```
      --constraint value             Placement constraints (default [])
      --endpoint-mode string         Endpoint mode (vip or dnsrr)
<snip>
      --restart-condition string     Restart when condition is met (none, on_failure, or any)
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
2016-07-06 12:10:28 +01:00
orkaa
1bdbfa5770 For the lulz! (evalulate -> evaluate)
Signed-off-by: orkaa <orkica@gmail.com>
2016-06-23 16:26:43 +02:00
Sven Dowideit
daedbc60d6 Add the advisory=rc metadata
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-06-20 11:54:53 +00:00
Sebastiaan van Stijn
37ee14a998
remove "RC" warning from Markdown files
A site-wide banner is going to be used, so we don't need this warning

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-20 00:24:37 -07:00
Sebastiaan van Stijn
f565bc7ec9
Add initial "service" docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-17 17:28:24 -07:00