Commit Graph

17 Commits

Author SHA1 Message Date
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
61122f748a Merge pull request #23820 from ericbarch/master
Add missing words in the swarm docs
Upstream-commit: e770b80d80485e99cdfb8e25341a087624d13b3a
Component: engine
2016-06-22 11:58:09 +10:00
a75adf3964 Merge pull request #23797 from liubin/fix-typo
fix some typos
Upstream-commit: 4962fea757415087755d7683e73bc0c7c7a39921
Component: engine
2016-06-22 11:56:48 +10:00
be2677812e Add missing words in the swarm docs
Signed-off-by: Eric Barch <barch@tomesoftware.com>
Upstream-commit: db158e9182f86adc721d6c401782983bfe51fd49
Component: engine
2016-06-21 08:28:59 -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
72d1e6e5de clarify swarm concept
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: e0296317131782008dcb94c72d591244663d61b1
Component: engine
2016-06-20 11:02:56 -07:00
85a0643506 add links to swarm and service commands to swarm mode overview
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: c13c5601961bb5ea30e21c9c8c469dd55a2f17d0
Component: engine
2016-06-19 11:43:49 -07: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