Commit Graph

439 Commits

Author SHA1 Message Date
Aaron Lehmann b41c3dd208 Add failure action for rolling updates
This changes the default behavior so that rolling updates will not
proceed once an updated task fails to start, or stops running during the
update. Users can use docker service inspect --pretty servicename to see
the update status, and if it pauses due to a failure, it will explain
that the update is paused, and show the task ID that caused it to pause.
It also shows the time since the update started.

A new --update-on-failure=(pause|continue) flag selects the
behavior. Pause means the update stops once a task fails, continue means
the old behavior of continuing the update anyway.

In the future this will be extended with additional behaviors like
automatic rollback, and flags controlling parameters like how many tasks
need to fail for the update to stop proceeding. This is a minimal
solution for 1.12.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-06-02 00:10:02 +00:00
Steve Durrheimer fea5a343d5 Add zsh completion for 'docker swarm join-token' command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:10:02 +00:00
Aaron Lehmann 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
Harald Albers a35ae076b4 bash completion for `docker swarm join-token`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:02 +00:00
Vincent Demeester 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
Sebastiaan van Stijn 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
Aaron Lehmann 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
Harald Albers 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
Harald Albers 1f0b0b007c Update completions for syslog log driver options
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:10:01 +00:00
Steve Durrheimer 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
Steve Durrheimer 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
Harald Albers 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
Harald Albers 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
Sebastiaan van Stijn 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
Vincent Demeester 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
Steve Durrheimer 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
Steve Durrheimer 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
Steve Durrheimer 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
Steve Durrheimer 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
Harald Albers 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
Sebastiaan van Stijn 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
Vincent Demeester 2e844f5e8d Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-02 00:07:50 +00:00
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers e417618387 bash completion for `docker {service,node}` filters
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:49 +00:00
Vincent Demeester 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
Jonathan Lomas 06683c5ea3 Remove unmatched bracket from _docker for zsh
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
2017-06-02 00:07:48 +00:00
Steve Durrheimer 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
Steve Durrheimer 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
Steve Durrheimer 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
Steve Durrheimer 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
Steve Durrheimer 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
Steve Durrheimer 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
Harald Albers ec37a0b192 Add bash completion for `docker ps --last`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:48 +00:00
allencloud 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
Harald Albers 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
Steve Durrheimer 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
Steve Durrheimer 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
Steve Durrheimer 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
Steve Durrheimer 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
Steve Durrheimer 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Harald Albers 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
Steve Durrheimer 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
Harald Albers 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
Harald Albers 53e1898a90 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>
2017-06-02 00:07:45 +00:00
Mike Goelzer ec3864b028 Add bash completion for `docker service scale`
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>

Conflicts:
	contrib/completion/bash/docker
2017-06-02 00:07:45 +00:00
Harald Albers 603002a3ec fix bash completion for `docker service` subcommands
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:45 +00:00
Ke Xu 903d9013a3 fix #23017, add zsh completion for dockerd
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2017-06-02 00:07:45 +00:00
Harald Albers 6cc83d80e0 bash completion for `docker swarm update --cert-expiry`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:44 +00:00
Arnaud Porterie (icecrime) 96150d3faa 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>
2017-06-02 00:07:44 +00:00
Mike Goelzer ec66559999 Update bash completion for Docker 1.12 CLI commands
Signed-off-by: Mike Goelzer <mike.goelzer@docker.com>
2017-06-02 00:07:44 +00:00
Kenfe-Mickael Laventure 5a9cc4cea8 Add bash completion support for --runtime and --add-runtime
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-06-02 00:07:44 +00:00
Kenfe-Mickael Laventure 48ae78b9b7 Add missing completion for --config-file
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-06-02 00:07:44 +00:00
Harald Albers b9997ebdee bash completion for `docker daemon --live-restore`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:43 +00:00
Dmitry Smirnov d965f30a15 Fix syntax errors in bash-completion (Closes: #23483)
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2017-06-02 00:07:43 +00:00
Steve Durrheimer 716caef299 Add zsh completion for 'docker run' healthcheck options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:43 +00:00
Steve Durrheimer f348cdda97 Add zsh completion for 'docker ps --filter=network'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:43 +00:00
Steve Durrheimer a2fbaa24cb Add zsh completion for 'docker events --filter' values
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:43 +00:00
Steve Durrheimer 27f2b96b70 Add zsh completion for 'docker {create,run} --pid' values
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:43 +00:00
Harald Albers a15b94e1bc bash completion for `docker ps --filter network`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:42 +00:00
Harald Albers 83e27e1f93 fix bash completion for dockerd with path
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:42 +00:00
Steve Durrheimer 6842d97361 Add zsh completion for 'docker search --limit'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:42 +00:00
Tianyi Wang 6a41b34f89 Fix zsh completion
- List all containers on `docker rm -f`

Signed-off-by: Tianyi Wang <capkurmagati@gmail.com>
2017-06-02 00:07:42 +00:00
Harald Albers 2657fae67d bash completion for detach events
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:41 +00:00
Harald Albers e116088cb2 bash completion for `docker run` healthcheck options
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:41 +00:00
Harald Albers ae11c80580 bash completion for `docker search --limit`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:41 +00:00
Harald Albers 3417ef2b0c bash completion for dockerd
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:40 +00:00
Vincent Demeester aac0a3ee13 Add before and since filter to images
Add support for two now filter on the `images` command : `before` and
`since`. They work the same as the one on the `ps` command but for
images.

        $ docker images --filter before=myimage
        # display all images older than myimage
        $ docker images --filter since=myimage
        # display all images younger than myimage

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-02 00:07:40 +00:00
Harald Albers dd83546376 bash completion for `docker ps -f {before,since}`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:40 +00:00
Harald Albers b4242ed63b bash completion for daemon events
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:40 +00:00
Steve Durrheimer 19318687b0 Add zsh completion for 'docker images' filters
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:39 +00:00
Fabrizio Soppelsa 52d265fff9 Add a --filter option to `docker search`
The filtering is made server-side, and the following filters are
supported:

* is-official (boolean)
* is-automated (boolean)
* has-stars (integer)

Signed-off-by: Fabrizio Soppelsa <fsoppelsa@mirantis.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-02 00:07:39 +00:00
Mrunal Patel 637048e176 Add support for --pid=container:<id>
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2017-06-02 00:07:39 +00:00
Sebastiaan van Stijn 73aeffd68e Fix typo in zsh completion
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-02 00:07:39 +00:00
Steve Durrheimer d1668b28ec Add zsh completion for 'docker network ls --filter label'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:38 +00:00
Steve Durrheimer 5b848ce0e4 Add zsh completion for 'docker daemon --max-concurrent-downloads --max-concurrent-uploads'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:38 +00:00
Steve Durrheimer 9eca8d95c0 Add zsh completion for 'docker logs --details'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:38 +00:00
Harald Albers 68e71057ed bash completion for `docker logs --details`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:38 +00:00
Harald Albers df62e269a1 bash completion for `docker daemon --max-concurrent-{down,up}load`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:38 +00:00
Damien Nadé 63d80a2ba8 contrib/completion/bash/docker: _docker_docker: quoting __docker_to_extglob result to avoid failglob interference
Signed-off-by: Damien Nadé <github@livna.org>
2017-06-02 00:07:38 +00:00
Brian Goff 8b38343e46 Make zsh completion work when ps output is custom
When `psFormat` is used in the docker client config json, if the output
is non-standard it breaks some of the completion handling for
containers.

This fixes that by ensuring that calls to `ps` use the default/standard
formatting by calling `docker ps --format 'table'`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-06-02 00:07:37 +00:00
Steve Durrheimer d3274f9217 Add zsh completion for 'docker network ls -f driver'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:37 +00:00
Sebastiaan van Stijn efff6c2b24 Add "driver" filter for network ls
This add a new filter to 'docker network ls'
to allow filtering by driver-name.

Contrary to "ID" and "name" filters, this
filter only supports an *exact* match.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-02 00:07:37 +00:00
Steve Durrheimer 586ec24a48 Add zsh completion for 'docker network ls -f {id,name,type}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:37 +00:00
Ke Xu 610c653172 add zsh completion for 'docker {build,create,run} --disable-content-trust'
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
2017-06-02 00:07:36 +00:00
Dan Walsh a60c612a04 Add support for setting sysctls
This patch will allow users to specify namespace specific "kernel parameters"
for running inside of a container.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2017-06-02 00:07:36 +00:00
Steve Durrheimer 8feaef5740 Add zsh completion for 'docker volume ls -f {dangling,driver,name}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:35 +00:00
Steve Durrheimer 6d7b352715 Add zsh completion for '--log-opt syslog-format=rfc5424micro'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:35 +00:00
Steve Durrheimer b7f5138adb Add zsh completion for '--log-opt syslog-format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-06-02 00:07:35 +00:00
Harald Albers 3b1ae8bbd6 bash completion for `docker volume ls -f {driver,name}`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:35 +00:00
Harald Albers 35bad4a914 bash completion for `--log-opt syslog-format`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:35 +00:00
Harald Albers e2491d2a7e bash completion for `docker history --human`
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:35 +00:00