18cd5ac352
Split advertised address from listen address
...
There are currently problems with "swarm init" and "swarm join" when an
explicit --listen-addr flag is not provided. swarmkit defaults to
finding the IP address associated with the default route, and in cloud
setups this is often the wrong choice.
Introduce a notion of "advertised address", with the client flag
--advertise-addr, and the daemon flag --swarm-default-advertise-addr to
provide a default. The default listening address is now 0.0.0.0, but a
valid advertised address must be detected or specified.
If no explicit advertised address is specified, error out if there is
more than one usable candidate IP address on the system. This requires a
user to explicitly choose instead of letting swarmkit make the wrong
choice. For the purposes of this autodetection, we ignore certain
interfaces that are unlikely to be relevant (currently docker*).
The user is also required to choose a listen address on swarm init if
they specify an explicit advertise address that is a hostname or an IP
address that's not local to the system. This is a requirement for
overlay networking.
Also support specifying interface names to --listen-addr,
--advertise-addr, and the daemon flag --swarm-default-advertise-addr.
This will fail if the interface has multiple IP addresses (unless it has
a single IPv4 address and a single IPv6 address - then we resolve the
tie in favor of IPv4).
This change also exposes the node's externally-reachable address in
docker info, as requested by #24017 .
Make corresponding API and CLI docs changes.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-02 00:10:02 +00:00
a35ae076b4
bash completion for `docker swarm join-token`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:02 +00:00
2f9e9bcbaa
Append --registry-auth with with
...
`--with-registry-auth` is more explicit.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-02 00:10:02 +00:00
6eef41333d
remove "secrets" from completion scripts
...
Swarm join has been changed in f5e1f6f6880391a5a3399023cf93a3c48502e57d,
removing various options and the "node accept" command.
This removes the removed options from the completion
scripts.
NOTE: a new command ("docker swarm join-token") was
also added, but is not part of this commit.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-02 00:10:02 +00:00
acf0bc4b9a
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>
2017-06-02 00:10:02 +00:00
6218da47b1
Add manual support for macvlan networks to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:01 +00:00
1f0b0b007c
Update completions for syslog log driver options
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:01 +00:00
f2e01edf57
Add zsh completion for 'docker node update --label-{add,rm}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:01 +00:00
ddd049d51a
Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:01 +00:00
56491f1caa
bash completion for `docker node update --label-{add,rm}`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:51 +00:00
cbaa143737
bash completion for `docker service {create,update} --log-{driver,opt}`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:51 +00:00
77e4100d00
Improve flag help consistency, and update docs
...
This adds the `--live-restore` option to the documentation.
Also synched usage description in the documentation
with the actual description, and re-phrased some
flag descriptions to be a bit more consistent.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-02 00:07:51 +00:00
1ca03e4fd9
Small zsh completion fix on --pretty & --no-resolve
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-02 00:07:51 +00:00
fdfa9befed
Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:51 +00:00
3ce44d633a
Add zsh completion for 'dockerd --oom-score-adjust'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:51 +00:00
0a6f1be9ce
Add zsh completion for 'docker service {create,update} --registry-auth'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:51 +00:00
dc7c008c08
Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:51 +00:00
94092e24a7
bash completion for `docker daemon --oom-score-adjust`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:50 +00:00
c33bc7d99e
Remove shorthand flags for "mount", "pretty", and "no-resolve"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-02 00:07:50 +00:00
2e844f5e8d
Remove --command flag for service update
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-02 00:07:50 +00:00
5ad5dc4baf
Change bash completion for `docker run --net*` to `--network*`
...
Ref: https://github.com/docker/docker/pull/23324
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:50 +00:00
a94dee25fc
Update bash completion for `docker service {create,update} {--mode,--endpoint-mode}`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:50 +00:00
2364392ded
bash completion for `docker service {create,update} --registry-auth`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:50 +00:00
2082c976e8
bash completion for default port on `docker swarm {init,join}`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:49 +00:00
14f578eb92
bash completion can be configured to show node and service IDs
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:49 +00:00
e417618387
bash completion for `docker {service,node}` filters
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:49 +00:00
de7c6a8355
Use "on-failure" for both containers and services
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-02 00:07:49 +00:00
06683c5ea3
Remove unmatched bracket from _docker for zsh
...
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
2017-06-02 00:07:48 +00:00
c51671ccb9
Add zsh completion for 'docker service' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:48 +00:00
649b3e132d
Add zsh completion for 'docker daemon --runtimes' and 'docker run --runtime'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:48 +00:00
b1ea724ae6
Add zsh completion for 'docker plugin' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:48 +00:00
e31b0e691a
Add zsh completion for 'docker swarm' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:48 +00:00
825b9a3b33
Add zsh completion for 'docker node' commands
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:48 +00:00
0f61955bdb
Add zsh completion for 'docker ps --last'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:48 +00:00
ec37a0b192
Add bash completion for `docker ps --last`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:48 +00:00
a03b5522fe
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-06-02 00:07:47 +00:00
29be1f50a8
bash completion enhancements for `docker {swarm,node,service}`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:47 +00:00
154a1c1206
Add zsh completion for 'load' and 'save' image events
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:46 +00:00
6e1e11e0e3
Add zsh completion for 'docker {create,run,network connect} --link-local-ip'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:46 +00:00
1216831bc6
Add zsh completion for 'docker run --storage-opt size='
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:46 +00:00
993d8f6dd4
Re-Add zsh completion for '-c' alias to '--cpu-shares'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:46 +00:00
95342189ab
Add zsh completion for 'docker daemon --storage-driver (overlay2|vfs)'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:46 +00:00
6440bac134
bash completion for `-c` alias to `--cpu-shares`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:46 +00:00
6f3d828938
bash completion for `docker daemon --storage-opt btrfs.min_space`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:46 +00:00
789cd4c65f
bash completion for `docker {run,create} --storage-opt`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:46 +00:00
1ffefe059f
bash completion for `load` and `save` image events
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:46 +00:00
884c0bab27
bash completion for `docker daemon --storage-driver olverlay2`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:46 +00:00
ef5f8ec503
bash completion for `docker {run,create,network connect} --link-local-ip`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:46 +00:00
5846f66bf2
Add zsh completion for 'docker daemon --live-restore'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:46 +00:00
ab24ffa000
fix bash completion for `docker {swarm,node}` subcommands
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:45 +00:00
Aaron Lehmann
Harald Albers
Vincent Demeester
Sebastiaan van Stijn
Steve Durrheimer
Jonathan Lomas
allencloud