Commit Graph

399 Commits

Author SHA1 Message Date
250e1ade84 Fix bash completion for docker swarm join --advertise-addr
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8f0986f04b
Component: cli
2017-06-02 00:10:04 +00:00
1315c8af13 Add self to bash completion of docker node inspect
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5b559678c3
Component: cli
2017-06-02 00:10:04 +00:00
9afa83e8be Add zsh completion for 'docker node rm --force'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 202d38d017
Component: cli
2017-06-02 00:10:04 +00:00
c9863d47e8 Add bash completion for docker node rm --force
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d01b14ad80
Component: cli
2017-06-02 00:10:03 +00:00
f04dc53753 update command description in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0ab07d2bd7
Component: cli
2017-06-02 00:10:03 +00:00
a50e247f5a Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f6aa2d75f0
Component: cli
2017-06-02 00:10:03 +00:00
84d3d32460 Remove zsh completion for 'docker swarm inspect'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: de93020c02
Component: cli
2017-06-02 00:10:03 +00:00
2278db9d39 cli: docker service|node|stack ps instead of tasks
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.

This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.

The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:

```
$ docker service ps condescending_cori
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 13 minutes ago  Running        6c6d232a5d0e
```

The following shows the output for the node on which the command is
running:

```console
$ docker node ps self
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
b1tpbi43k1ibevg2e94bmqo0s  mad_kalam.1           mad_kalam           apline  Accepted 2 seconds ago  Accepted       6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 12 minutes ago  Running        6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5  furious_davinci.1     furious_davinci     redis   Running 32 minutes ago  Running        6c6d232a5d0e
```

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 9d114f0fae
Component: cli
2017-06-02 00:10:03 +00:00
2c57345d81 Remove bash completion for docker swarm inspect
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: bd66024f73
Component: cli
2017-06-02 00:10:03 +00:00
9cf559702d bash completion for container labels to service {create,update}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6ff1bec0ba
Component: cli
2017-06-02 00:10:03 +00:00
4594082206 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>
Upstream-commit: b41c3dd208
Component: cli
2017-06-02 00:10:02 +00:00
772dfd499f Add zsh completion for 'docker swarm join-token' command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: fea5a343d5
Component: cli
2017-06-02 00:10:02 +00:00
609c7c0bcb 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: 18cd5ac352
Component: cli
2017-06-02 00:10:02 +00:00
9244292285 bash completion for docker swarm join-token
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a35ae076b4
Component: cli
2017-06-02 00:10:02 +00:00
a677374f33 Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2f9e9bcbaa
Component: cli
2017-06-02 00:10:02 +00:00
de76192c9e 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: 6eef41333d
Component: cli
2017-06-02 00:10:02 +00:00
e128f0ccd5 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>
Upstream-commit: acf0bc4b9a
Component: cli
2017-06-02 00:10:02 +00:00
0ef7be695f Add manual support for macvlan networks to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6218da47b1
Component: cli
2017-06-02 00:10:01 +00:00
0c50f823f7 Update completions for syslog log driver options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1f0b0b007c
Component: cli
2017-06-02 00:10:01 +00:00
09d64ed0cb Add zsh completion for 'docker node update --label-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f2e01edf57
Component: cli
2017-06-02 00:10:01 +00:00
bbf1c30986 Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ddd049d51a
Component: cli
2017-06-02 00:10:01 +00:00
87d34bb5c1 bash completion for docker node update --label-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 56491f1caa
Component: cli
2017-06-02 00:07:51 +00:00
09c5057193 bash completion for docker service {create,update} --log-{driver,opt}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cbaa143737
Component: cli
2017-06-02 00:07:51 +00:00
c6248ce73e 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>
Upstream-commit: 77e4100d00
Component: cli
2017-06-02 00:07:51 +00:00
e7aaba73d9 Small zsh completion fix on --pretty & --no-resolve
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1ca03e4fd9
Component: cli
2017-06-02 00:07:51 +00:00
1b3cd7e680 Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: fdfa9befed
Component: cli
2017-06-02 00:07:51 +00:00
2a4a489b0c Add zsh completion for 'dockerd --oom-score-adjust'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 3ce44d633a
Component: cli
2017-06-02 00:07:51 +00:00
771c319a28 Add zsh completion for 'docker service {create,update} --registry-auth'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0a6f1be9ce
Component: cli
2017-06-02 00:07:51 +00:00
ac7474cbb7 Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: dc7c008c08
Component: cli
2017-06-02 00:07:51 +00:00
a32637bf7a bash completion for docker daemon --oom-score-adjust
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 94092e24a7
Component: cli
2017-06-02 00:07:50 +00:00
857bcf3a13 Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c33bc7d99e
Component: cli
2017-06-02 00:07:50 +00:00
34f04d67ef Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2e844f5e8d
Component: cli
2017-06-02 00:07:50 +00:00
8070cdebc7 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: 5ad5dc4baf
Component: cli
2017-06-02 00:07:50 +00:00
e8780adb60 Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a94dee25fc
Component: cli
2017-06-02 00:07:50 +00:00
26674d9fa1 bash completion for docker service {create,update} --registry-auth
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2364392ded
Component: cli
2017-06-02 00:07:50 +00:00
1faecfc45b bash completion for default port on docker swarm {init,join}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2082c976e8
Component: cli
2017-06-02 00:07:49 +00:00
a3109e1623 bash completion can be configured to show node and service IDs
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 14f578eb92
Component: cli
2017-06-02 00:07:49 +00:00
a0a4ff54be bash completion for docker {service,node} filters
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e417618387
Component: cli
2017-06-02 00:07:49 +00:00
ad92fbb392 Use "on-failure" for both containers and services
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: de7c6a8355
Component: cli
2017-06-02 00:07:49 +00:00
22c3d30a71 Remove unmatched bracket from _docker for zsh
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
Upstream-commit: 06683c5ea3
Component: cli
2017-06-02 00:07:48 +00:00
afdbe8b1ee Add zsh completion for 'docker service' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c51671ccb9
Component: cli
2017-06-02 00:07:48 +00:00
ef137b399e Add zsh completion for 'docker daemon --runtimes' and 'docker run --runtime'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 649b3e132d
Component: cli
2017-06-02 00:07:48 +00:00
4c8314bbbb Add zsh completion for 'docker plugin' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b1ea724ae6
Component: cli
2017-06-02 00:07:48 +00:00
e92a7c1e2b Add zsh completion for 'docker swarm' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e31b0e691a
Component: cli
2017-06-02 00:07:48 +00:00
9e622cd658 Add zsh completion for 'docker node' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 825b9a3b33
Component: cli
2017-06-02 00:07:48 +00:00
e848d54c14 Add zsh completion for 'docker ps --last'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0f61955bdb
Component: cli
2017-06-02 00:07:48 +00:00
1eabd2ce29 Add bash completion for docker ps --last
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ec37a0b192
Component: cli
2017-06-02 00:07:48 +00:00
7844efa404 make cmd short short consistency and change docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a03b5522fe
Component: cli
2017-06-02 00:07:47 +00:00
abc7ff0935 bash completion enhancements for docker {swarm,node,service}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 29be1f50a8
Component: cli
2017-06-02 00:07:47 +00:00
8dfa9d87a0 Add zsh completion for 'load' and 'save' image events
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 154a1c1206
Component: cli
2017-06-02 00:07:46 +00:00