docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,772 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
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 2cc5bd33eef038bf5721582e2410ba459bb656e9)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:16:59 -07:00
Dong Chen f3fea0ea88 Support node label update. 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
(cherry picked from commit e1165cdfd1d666b1d4e041ef6a0d5fd049e041c1)
Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-07-25 23:15:26 -07:00
Daniel Nephin 12a00e6017 Add Swarm management CLI commands 
As described in our ROADMAP.md, introduce new Swarm management commands
to call to the corresponding API endpoints.

This PR is fully backward compatible (joining a Swarm is an optional
feature of the Engine, and existing commands are not impacted).

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-06-13 22:17:15 -07:00