Commit Graph

351 Commits

Author SHA1 Message Date
92dde977e4 add iptables=false to docs for multiple daemons
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 59e2c57540
Component: cli
2017-06-02 00:07:49 +00:00
177af81c48 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>
Upstream-commit: 3ebe3fe752
Component: cli
2017-06-02 00:07:49 +00:00
29b9ce751d Generate a swarm joining secret if none is specified
The current behavior of `docker swarm init` is to set up a swarm that
has no secret for joining, and does not require manual acceptance for
workers. Since workers may sometimes receive sensitive data such as pull
credentials, it makes sense to harden the defaults.

This change makes `docker swarm init` generate a random secret if none
is provided, and print it to the terminal. This secret will be needed to
join workers or managers to the swarm. In addition to improving access
control to the cluster, this setup removes an avenue for
denial-of-service attacks, since the secret is necessary to even create
an entry in the node list.

`docker swarm init --secret ""` will set up a swarm without a secret,
matching the old behavior. `docker swarm update --secret ""` removes the
automatically generated secret after `docker swarm init`.

Closes #23785

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e632408a37
Component: cli
2017-06-02 00:07:49 +00:00
ad92fbb392 Use "on-failure" for both containers and services
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: de7c6a8355
Component: cli
2017-06-02 00:07:49 +00:00
c75cd892f1 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>
Upstream-commit: 20859b146b
Component: cli
2017-06-02 00:07:49 +00:00
166ef9b898 Change NAME to HOSTNAME in docs for docker node ls
In #24159, the title field of `docker node ls` has been
changed from NAME to HOSTNAME. However, in the docs the
NAMEs are still used for the output of `docker node ls`.

This fix updates docs so that NAME field is changed to
HOSTNAME for all `docker node ls`.

This fix is related to #24159 and #24090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: cab7139a4b
Component: cli
2017-06-02 00:07:48 +00:00
80567c7095 Fix spelling in comments, strings and documentation
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: 8e2c3efc58
Component: cli
2017-06-02 00:07:48 +00:00
273d3ff4f9 man: add missing --add-runtime
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: fac7c67349
Component: cli
2017-06-02 00:07:48 +00:00
2138a28ca7 Fix typo
Signed-off-by: Adolfo Ochagavía <aochagavia92@gmail.com>
Upstream-commit: cbfebbb25a
Component: cli
2017-06-02 00:07:48 +00:00
9132e9d27a fix typo in "readonly" flag in documentation
the flag is named '--read-only', not '--readonly'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b4a798e983
Component: cli
2017-06-02 00:07:48 +00:00
688d1a439b Update network_create.md
minor typos and punctuation.

Signed-off-by: Alan Thompson <cloojure@gmail.com>
Upstream-commit: bd67dfdd33
Component: cli
2017-06-02 00:07:47 +00:00
98d6b5e9ba Fix --auto-accept documentation
The --auto-accept documentation currently says that both worker and
manager nodes are automatically accepted by default. Correct it.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: ca0240f9c2
Component: cli
2017-06-02 00:07:47 +00:00
89a2975fe8 add menu.md, make index.md command line reference, update typos/minor errors in cli docs
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: a3b4cd7d99
Component: cli
2017-06-02 00:07:47 +00:00
138f629d25 rename desired_state filter to desired-state
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b9505045d9
Component: cli
2017-06-02 00:07:47 +00:00
e37780149a [Docs] clarified local volume driver docs
Signed-off-by: Nico <nicolaka@gmail.com>
Upstream-commit: f68b707d60
Component: cli
2017-06-02 00:07:47 +00:00
f9d84ba5b2 Add documentation for external CA features in API/CLI
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 4721039d71
Component: cli
2017-06-02 00:07:47 +00:00
7844efa404 make cmd short short consistency and change docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a03b5522fe
Component: cli
2017-06-02 00:07:47 +00:00
7616636626 add documentation for desired_state filter
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 77d6b3721e
Component: cli
2017-06-02 00:07:47 +00:00
19fb36b794 uppercase output in node inspect to keep consistency
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a9fcf23fb9
Component: cli
2017-06-02 00:07:47 +00:00
9c9004d65c For the lulz! (evalulate -> evaluate)
Signed-off-by: orkaa <orkica@gmail.com>
Upstream-commit: d2f61188f1
Component: cli
2017-06-02 00:07:46 +00:00
96750effa4 Added daemon.json Windows example
Signed-off-by: Neil Peterson <neilpeterson@outlook.com>
Upstream-commit: 32054251c7
Component: cli
2017-06-02 00:07:46 +00:00
3abf4d85b1 PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 94b45e398f
Component: cli
2017-06-02 00:07:45 +00:00
50e82af126 update docker swarm cli
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 87591ae9b7
Component: cli
2017-06-02 00:07:45 +00:00
5357e9b84b Add the advisory=rc metadata
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: b6bfe363f8
Component: cli
2017-06-02 00:07:45 +00:00
16d2ae21bb 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>
Upstream-commit: 7b22dbd02a
Component: cli
2017-06-02 00:07:45 +00:00
3196139f55 Update help output to match Docker 1.11.
* Also touch up headings.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: def6847e11
Component: cli
2017-06-02 00:07:45 +00:00
d57b7662f3 Add initial "service" docs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 03c9762fba
Component: cli
2017-06-02 00:07:45 +00:00
04ba85430e update output for node commands, minor edits
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: a816f63e57
Component: cli
2017-06-02 00:07:44 +00:00
51b169e361 Add cert-expiry to swarm update
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 308888a8c6
Component: cli
2017-06-02 00:07:44 +00:00
792e5c1370 Update docker info output example
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 541dcf39ad
Component: cli
2017-06-02 00:07:44 +00:00
2155651b3d docs: move "advisory" to general metadata
the advisory option should not be
below "menu"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bfbf538f68
Component: cli
2017-06-02 00:07:44 +00:00
8ba9627310 Make --dispatcher-heartbeat-period a duration
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: 96150d3faa
Component: cli
2017-06-02 00:07:44 +00:00
79a261a81e no more 'docker node reject' in docs
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: d8fee0b06e
Component: cli
2017-06-02 00:07:44 +00:00
3bc24bacb3 docker plugin commandline reference
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6c1739b80d
Component: cli
2017-06-02 00:07:44 +00:00
6e77acb1af Allow user to specify container's link-local addresses
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 987e5e6d8a
Component: cli
2017-06-02 00:07:44 +00:00
85311f09ff Add support for multiples runtimes
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 090cf185cd
Component: cli
2017-06-02 00:07:44 +00:00
e1cb76e0ab surfacing Learn by example topics to top level of Docker Engine docs
fixing links after moving surfacing tutorials

fixing more links for the newly located tutorials

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: d3b7a2779e
Component: cli
2017-06-02 00:07:43 +00:00
15cc239caf CLI docs
Signed-off-by: Amit Shukla <amit.shukla@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 593ee1e29d
Component: cli
2017-06-02 00:07:43 +00:00
0f8e9c934d Add documentation for using overlay2
Add mention in dockerd command line and storage driver selection documentation.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: e7fa3c6279
Component: cli
2017-06-02 00:07:43 +00:00
241823f132 Add link to Docker Hub.
* To make it consistent with similar references in other parts of document.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: a443697846
Component: cli
2017-06-02 00:07:43 +00:00
caa5df4827 re-doing Docker Engine overview topics for v.1.12
fixed broken links created from Engine Overview update by adding missing topic to daemon reference page and updating the hrefs in the api pages

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 26e3227441
Component: cli
2017-06-02 00:07:42 +00:00
4042629924 Update docker-load documentation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 478055c89c
Component: cli
2017-06-02 00:07:42 +00:00
4b775a7c57 network docs cleanup
This fixes some Markup and formatting
issues in the network documentation;

- wrap text to 80 chars
- add missing language hints for code examples
- add missing line continuations (\)
- update USAGE output for Cobra

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bb0afa7381
Component: cli
2017-06-02 00:07:42 +00:00
6027bd0b49 add support for filtering by network ID
This adds support for filtering by network ID, to be
consistent with other filter options.

Note that only *full* matches are returned; this is
consistent with other filters (e.g. volume), that
also return full matches only.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 44cc95141e
Component: cli
2017-06-02 00:07:42 +00:00
e516832be1 Adding network filter to docker ps command
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Upstream-commit: eef6bd0b23
Component: cli
2017-06-02 00:07:42 +00:00
912aa358d8 Fix a couple of typos in the docs of docker attach
This fix fixed a couple of typos in the docs of `docker attach`:
docs/reference/commandline/attach.md
man/docker-attach.1.md

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7a63e88e36
Component: cli
2017-06-02 00:07:42 +00:00
744bf7d726 docs: correct network create command
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: d04810fa14
Component: cli
2017-06-02 00:07:42 +00:00
843aab9e59 Fix a couple of typos in docker attach docs.
This fix fixes a couple of typos in docker attach docs:
docs/reference/commandline/attach.md
man/docker-attach.1.md

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e7ec7bbd33
Component: cli
2017-06-02 00:07:41 +00:00
30ff620184 attach: replace interface with simple type
Also add docs to detach events

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 9c351e61c0
Component: cli
2017-06-02 00:07:41 +00:00
3e4d4aaf26 docs validation fixes
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: de82bb1c55
Component: cli
2017-06-02 00:07:41 +00:00