0ct0pu5/moby

Author SHA1 Message Date

Author	SHA1	Message	Date
Charles Smith	3696d1fff5	Merge pull request #25182 from sfsmithcha/clarify_join_token Author Merge add advertise address, clarify join token CI errors expected. (cherry picked from commit `ee355e017d`)	2016-07-29 16:17:48 -07:00
Sebastiaan van Stijn	2e8165d503	Remove release-candidate advisories Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `053ac127ab`) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> Conflicts: docs/reference/api/docker_remote_api_v1.25.md docs/reference/commandline/service_create.md	2016-07-27 21:46:51 +10:00
Aaron Lehmann	5d7a3f7b5f	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> (cherry picked from commit `2cc5bd33ee`) Signed-off-by: Tibor Vass <tibor@docker.com>	2016-07-25 23:16:59 -07:00

Charles Smith

3696d1fff5

Merge pull request #25182 from sfsmithcha/clarify_join_token

Author Merge add advertise address, clarify join token

CI errors expected.
(cherry picked from commit ee355e017d)

2016-07-29 16:17:48 -07:00

Sebastiaan van Stijn

2e8165d503

Remove release-candidate advisories

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 053ac127ab)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
	docs/reference/commandline/service_create.md

2016-07-27 21:46:51 +10:00

Aaron Lehmann

5d7a3f7b5f

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>
(cherry picked from commit 2cc5bd33ee)
Signed-off-by: Tibor Vass <tibor@docker.com>

2016-07-25 23:16:59 -07:00

3 commits