2150ea40b1
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 >
Upstream-commit: a0ccd0d42fdb0dd2005f67604cb81a5a6b26787e
Component: engine
2016-07-24 09:23:07 -07:00
97afc3bb53
Merge pull request #24934 from albers/completion-swarm-join-token
...
bash completion for `docker swarm join-token`
Upstream-commit: 771cf8380768493b0c2f2b104998347071fd12db
Component: engine
2016-07-22 11:24:25 -07:00
d557e73d7c
Merge pull request #24885 from vdemeester/24875-registrauth-with
...
Rename `--registry-auth` to `--with-registry-auth`
Upstream-commit: 97039324c0e5621f6aa2c6e1d1c809384463e4a8
Component: engine
2016-07-22 19:05:49 +02:00
6cc1227a79
bash completion for docker swarm join-token
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 42b4d6ebe44029155d98d623c9d51f0cda89e194
Component: engine
2016-07-22 17:39:55 +02:00
853f500703
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 >
Upstream-commit: c4ab20c5f8c13d9d91dbd29fd41fc0d78f93ab0d
Component: engine
2016-07-22 14:26:21 +02:00
1ec535a2d9
Append --registry-auth with with
...
`--with-registry-auth` is more explicit.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8426f72107f351b769babadeabbf13f205126514
Component: engine
2016-07-22 10:38:56 +02:00
700598ff90
Add manual support for macvlan networks to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6c98d5bfaccda4b211e537f5072767160a20d497
Component: engine
2016-07-20 13:13:14 -07:00
ce6757e883
Update completions for syslog log driver options
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 492fdf1f57bff10bed5d44bf63f344c1d7961eb2
Component: engine
2016-07-20 12:35:04 -07:00
91c5d7692b
Merge pull request #24791 from albers/completion-node-update-labels
...
bash completion for `docker node update --label-{add,rm}`
Upstream-commit: be2e2fca089029d1fb0d8dc73e5046cfb1c62bdf
Component: engine
2016-07-19 15:22:29 +02:00
a525842279
bash completion for docker service {create,update} --log-{driver,opt}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 823e161de73e2df04cd3905b72b7916c49091af4
Component: engine
2016-07-19 13:20:40 +02:00
3ac251def6
bash completion for docker node update --label-{add,rm}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: bc6e3c0b5e415f09957955782b4d51e94a5ff2b9
Component: engine
2016-07-19 13:09:28 +02:00
1382e56d1b
Merge pull request #24598 from albers/completion-daemon--oom-score-adjust
...
bash completion for `docker daemon --oom-score-adjust`
Upstream-commit: 7925de9098e6ce5d7e5c2a8a19926f1f90105090
Component: engine
2016-07-13 23:34:54 +02:00
4c71a2a9b6
bash completion for docker daemon --oom-score-adjust
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e1e310ea1fc47488a7404e3fa52fa606fe270ed0
Component: engine
2016-07-13 12:31:55 -07:00
bb985637e2
Remove shorthand flags for "mount", "pretty", and "no-resolve"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7bf0faf42377a91a8535b443201d9ad62326889b
Component: engine
2016-07-13 18:47:29 +02:00
f08872faee
Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
...
Remove --command flag for service update
Upstream-commit: 58624acf11405c482ff0abbc9674cd5441ccce57
Component: engine
2016-07-13 16:01:11 +00:00
1348489290
Remove --command flag for service update
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: e4a024d5902df1d3db8b9fff8865304afa2305e6
Component: engine
2016-07-13 16:19:21 +02:00
0a5f2230dd
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 >
Upstream-commit: c4846f697271d2990cca8481338f4827b2558112
Component: engine
2016-07-13 12:42:33 +02:00
6e8f820ea2
Merge pull request #24581 from albers/completion-service--endpoint-mode
...
Update bash completion for `docker service {create,update} {--mode,--…
Upstream-commit: ae1a809c39c72d50554740e42bb1a4af3a9dbfb1
Component: engine
2016-07-13 09:52:52 +00:00
70db2efccc
Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a394490d3895fe0122b44a3f89acc04946b83bda
Component: engine
2016-07-13 11:37:31 +02:00
97f6147543
bash completion for docker service {create,update} --registry-auth
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a44e71c4274cd311e99722277cb674b2bc84d86e
Component: engine
2016-07-13 11:20:02 +02:00
1a5af00ee4
Merge pull request #24119 from albers/completion-swarm-mode
...
Fix & improve bash completion for swarm mode commands
Upstream-commit: 2664f374527d160b14f55b5547fef14f0e813eec
Component: engine
2016-07-08 15:34:51 -04:00
f5a13a7cbe
Use "on-failure" for both containers and services
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a859a336475f39c7b7d7739c58a1dae40df86a86
Component: engine
2016-07-07 11:32:19 +02:00
219d193b75
bash completion for default port on docker swarm {init,join}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 009d50e2d8c4f74f38ebefe89b8dd44b69b46660
Component: engine
2016-07-03 10:48:37 -07:00
8b06f8a5b3
bash completion can be configured to show node and service IDs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 715754ee61a83a710f5c0c3974cfed6b453d5595
Component: engine
2016-07-03 10:48:37 -07:00
7b31cc7b25
bash completion for docker {service,node} filters
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2b34fa0511a5193b1cb07493555872cfd6b70442
Component: engine
2016-07-03 10:48:37 -07:00
03817e7b70
Add bash completion for docker ps --last
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dd883b0ce249961c5d498ebb03fc0f2911ca2586
Component: engine
2016-07-03 10:36:34 -07:00
24fc12c925
bash completion enhancements for docker {swarm,node,service}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e3339a75d3d9e79ed5b8d372237ce5d2802910ba
Component: engine
2016-06-22 20:23:46 +02:00
49342f2690
Merge pull request #23805 from albers/completion--cpu-shares--c
...
bash completion for `-c` alias to `--cpu-shares`
Upstream-commit: a6f7167c0ac4357cab40df9b38532f945bf1a011
Component: engine
2016-06-21 21:19:06 +10:00
1387ff4c20
Merge pull request #23804 from albers/completion-btrfs-min_space
...
bash completion for `docker daemon --storage-opt btrfs.min_space`
Upstream-commit: 5ba6b1e89c61504eafaf4d77b585b0b0e27d204f
Component: engine
2016-06-21 21:18:49 +10:00
c574280c95
Merge pull request #23803 from albers/completion-run--storage-opt
...
bash completion for `docker {run,create} --storage-opt`
Upstream-commit: a1eb6528ebba8bf714e6be4a9405bf80f7ca7725
Component: engine
2016-06-21 21:18:32 +10:00
c24ff25368
Merge pull request #23800 from albers/completion-events-load-save
...
bash completion for `load` and `save` image events
Upstream-commit: 38b07e7fa6acff2dd3fb693ae58a665511b584b8
Component: engine
2016-06-21 21:18:16 +10:00
9ec176f9fe
Merge pull request #23799 from albers/completion-storage-driver-overlay2
...
bash completion for `docker daemon --storage-driver olverlay2`
Upstream-commit: d5939876be4ac6ea518c94f1d62dcadec102e79b
Component: engine
2016-06-21 21:18:01 +10:00
fa97a09588
bash completion for -c alias to --cpu-shares
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 79296b2770b6d629a2e6ab02f888294a99f62153
Component: engine
2016-06-21 11:30:26 +02:00
b53f3f9206
bash completion for docker daemon --storage-opt btrfs.min_space
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f693b99870031a6f5311defa9aba13b690323594
Component: engine
2016-06-21 11:11:11 +02:00
7e778e4a05
bash completion for docker {run,create} --storage-opt
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 7d2ffa00c08e2f316285fe2f9adf81255f5ae688
Component: engine
2016-06-21 11:04:09 +02:00
09d393de2e
bash completion for load and save image events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5334520bf04598121b026c0b5018714fd4120d44
Component: engine
2016-06-21 10:26:21 +02:00
d6fbd5b999
bash completion for docker daemon --storage-driver olverlay2
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d96eeff19416be61e7e021c9dfaed8728a177d02
Component: engine
2016-06-21 10:19:07 +02:00
89b0e5f71b
bash completion for docker {run,create,network connect} --link-local-ip
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 98483f57ed984acd0d1c1f0de85c2b82c0308896
Component: engine
2016-06-21 09:43:34 +02:00
e8b9b6a393
fix bash completion for docker {swarm,node} subcommands
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: e65f036e134c428b1303b00a8f08b0eea79f0701
Component: engine
2016-06-18 10:28:20 -07:00
26f07d39fc
correct sort order in new bash completions
...
The completion for the new `docker service`, `docker swarm` and
`docker node` command families were partly added in non-alphabetical
order.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 19753ec84dcd2961adf64c4c66b09a2f4ca3220a
Component: engine
2016-06-18 09:54:44 -07:00
fff885e0ad
Add bash completion for docker service scale
...
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com >
Conflicts:
contrib/completion/bash/docker
Upstream-commit: 5cf73a47f5327c38b27400012333a9e569f1a584
Component: engine
2016-06-18 09:27:06 -07:00
e21a14517a
Merge pull request #23665 from albers/fix-completion-service
...
fix bash completion for `docker service` subcommands
Upstream-commit: 2989e7b2a0f55b4c8ec4c21118a172295f1b03b7
Component: engine
2016-06-17 17:54:49 -07:00
c653aa3775
fix bash completion for docker service subcommands
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 42f3b1f4adeb251e15ea0ca0af2a1e98cb9a7145
Component: engine
2016-06-17 09:49:46 +02:00
6b5e5294c2
bash completion for docker swarm update --cert-expiry
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: dc2fc75d4260767937d98ea81c51fdea148162b2
Component: engine
2016-06-17 08:49:06 +02:00
0b871ed824
Make --dispatcher-heartbeat-period a duration
...
Make `--dispatcher-heartbeat-period` a duration in `docker swarm
update`, allowing to express the value as "5s", "1h", etc.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: e6e1fd5d0657c3ab5b15c2984403e4a4e62ca2bb
Component: engine
2016-06-14 18:10:49 -07:00
c6289ff5b6
Update bash completion for Docker 1.12 CLI commands
...
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com >
Upstream-commit: 35e2970b984971465b107aec1e6f2e9c274183f4
Component: engine
2016-06-14 12:57:40 -07:00
c95e7259f3
Add bash completion support for --runtime and --add-runtime
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 6e9bf4d3167c19bed0b8136d38bc1fe9146a45e5
Component: engine
2016-06-14 07:47:31 -07:00
e23f5a9f28
Add missing completion for --config-file
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 1a6ed50e1f295714f6e514ec2c6127717b281216
Component: engine
2016-06-14 07:47:31 -07:00
d6f84e3953
Merge pull request #23506 from albers/completion-daemon---live-restore
...
bash completion for `docker daemon --live-restore`
Upstream-commit: 74873f192ad0b0cdced4a3fcc2170e5d69aabbb5
Component: engine
2016-06-14 17:24:00 +08:00
da7d2c47f4
bash completion for docker daemon --live-restore
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 73882e8f833f3b141c309d543cfe9e84efc00e62
Component: engine
2016-06-14 09:14:25 +02:00
