Commit Graph

20 Commits

Author SHA1 Message Date
607a298d5c update create swarm and add nodes to use the auto-generated join command
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: fec803f7793ce347fe276ea93c13fb9022677135
Component: engine
2016-07-14 11:26:46 -07:00
d0a542295a Update service inspect --pretty reference docs
Update the output and fix wrong usage in a tutorial page.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cc651bc642e3478062416b50171dbf5595daf4e4
Component: engine
2016-07-14 11:23:03 +02:00
b84397788e Use spaces, not tabs, to format sample "swarm join" command
Using tabs here seems to cause copy/paste problems in some terminals.
Using spaces is safer.

Fixes #24609

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6de8fcb2f2baf335fc24e10909078199af528e8d
Component: engine
2016-07-13 19:31:05 -06:00
b43802545b Merge pull request #24565 from thaJeztah/fix-node-inspect-formatting
docs: fix output of node inspect
Upstream-commit: 1dbe3f6e89e68e9f5cc8839dacc4f10281db1ead
Component: engine
2016-07-13 18:57:05 +02:00
891b2576ba Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
Upstream-commit: 92b15778712ff2eb85bf5b7e00fb4fe4310fd6b1
Component: engine
2016-07-13 15:13:58 +02:00
629585dfca docs: fix output of node inspect
The output uses tabs, but those don't
translate well to the rendered output in
the docs, so replacing the tabs with spaces.

Also updates the output, because REPLICATED,
and SPREAD are no longer all-caps in the
actual output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 477a5f8fb0be1244858614cdda2d2528208fc88a
Component: engine
2016-07-13 01:53:51 +02:00
937633217f Make labels human readable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ea365e4cb37d037046364773d01a744b1258ce4e
Component: engine
2016-07-13 01:08:54 +02:00
eb5386f068 Fix a minor typo in swarm tutorial docs
This fix fixes a minor typo in swarm tutorial's delete service docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 93fa7e75553c3332314b3b988f7082cfde857475
Component: engine
2016-07-12 05:00:39 -07:00
a5fef9cf19 Merge pull request #24349 from aaronlehmann/swarm-secrets-by-default
Generate a swarm joining secret if none is specified
Upstream-commit: db67db98d837517123abf7f3efbb04d0bec3708b
Component: engine
2016-07-07 11:43:08 -07:00
3bc3d3b9a0 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: 668b8a998f5ebbe66c7376c432a5fd87208add73
Component: engine
2016-07-06 20:23:53 -07:00
08bcf7365f 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: 7342e42fcecbc243bcb8723b8422879662452017
Component: engine
2016-07-06 13:04:50 -07:00
aff589c152 remove incorrect L3 recommendation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a26852223ecc9bed25ad7e0c6e2a8c0601db8b1e
Component: engine
2016-07-01 18:13:29 -07:00
0e7c9136da remove margin from bottom of swarm mode docs
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 0d6f59e85a2728008aad154d366cc8c92888e871
Component: engine
2016-06-28 19:46:39 -07:00
3194815e09 correct output description - only one task is running on manager
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 5f219806fce6c70bfea1a610476e7e3e6e78371d
Component: engine
2016-06-22 12:41:22 -07:00
923b4bd8ef fix some typos
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: 950073aabb305db6156709ea8509b1f72ff06f3b
Component: engine
2016-06-21 15:29:25 +08:00
e75e9b54a9 update cli commands output for rc1, revise key concepts
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 9499d5fd522e2fa31e5d0458c4eb9b420f164096
Component: engine
2016-06-18 11:38:27 -07:00
e787e67ec5 advisory can't be in the [menu] section
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: bc033cb706fd22e3934968b0dfdf93da962e36a8
Component: engine
2016-06-16 11:59:47 +00:00
93b2574efc Change SCALE to REPLICAS.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4df03499486a7f62f94bd1fb8e2625b0ef932fe5
Component: engine
2016-06-15 17:57:59 -04:00
31529f7e86 update formatting for variables, clarify text in certain topics
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 7b0c3066e30d721fb9efbac74e9675e1baeb019a
Component: engine
2016-06-14 16:35:40 -07:00
2f81321106 add tutorial
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: ea4fef2d875de39044ca7570c35365b75086e8a5
Component: engine
2016-06-13 22:17:15 -07:00