Commit Graph

9 Commits

Author SHA1 Message Date
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
60d7b2e452 fix stdout and stderr in api client
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 533bd82e41fee352962cb5ae0a49b9edbdebc25e
Component: engine
2016-07-05 23:07:40 +08:00
8c9dd4362c Unify swarm init and update options
Add api side validation and defaults for init and
join requests.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: fb3eb1c27ef5520571c599ead8a72b343748db39
Component: engine
2016-06-21 16:34:32 -07:00
22e8ff931c Use flag constants for swarm flag.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c08a50dbd1bac8a0bf1c9be5e617273c19a54a2e
Component: engine
2016-06-20 11:04:37 -04:00
480d3f4e51 Add tests for AutoAcceptOption
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c544649874bfecf2e6b8a00a0b25db309d81cf94
Component: engine
2016-06-17 19:43:38 -07:00
5fe17becef Support a listen addr without a port, and add tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 595e79b805fd6e96d2e6c8876f7c9734164f5db7
Component: engine
2016-06-17 19:43:38 -07:00
6ddced327d docker swarm: more consistent CLI help
This changes `docker swarm help` to be consistent with capitals
and removes full stops.

Before:

```
Commands:
  init        Initialize a Swarm.
  join        Join a Swarm as a node and/or manager.
  update      update the Swarm.
  leave       Leave a Swarm.
  inspect     Inspect the Swarm
```

After:

```
Commands:
  init        Initialize a Swarm
  join        Join a Swarm as a node and/or manager
  update      Update the Swarm
  leave       Leave a Swarm
  inspect     Inspect the Swarm
```

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
Upstream-commit: 0ec78739ac7d8ec1579d1d4fd63cd207dc56e7c8
Component: engine
2016-06-17 16:34:06 +01:00
9bd6973edb fix docker swarm init/update --secret
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 085895342c7f797f0eef7ec956438e33489f211f
Component: engine
2016-06-15 17:05:10 -07:00
e808aa4ed0 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>
Upstream-commit: 12a00e60177ca42bfb1dd9ebd5dce1c7039da6dd
Component: engine
2016-06-13 22:17:15 -07:00