Commit Graph

426 Commits

Author SHA1 Message Date
5287c26318 Add bash completion for dockerd --init-path
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3171c7b6e7
Component: cli
2017-06-02 00:10:12 +00:00
23796877c1 Add a new "is-task" ps filter
This makes it easier to list containers that are part of a task
(swarm mode) and those who are not.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cd547751df
Component: cli
2017-06-02 00:10:12 +00:00
61649df81a Fix bash completion for docker logs --since
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ee85efb76d
Component: cli
2017-06-02 00:10:12 +00:00
f2dbfd6f6f Add zsh completion for 'docker stats --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: bed270a507
Component: cli
2017-06-02 00:10:11 +00:00
3c59f5a59d Add zsh completion for multi-nodes 'node ps'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 365e71d868
Component: cli
2017-06-02 00:10:11 +00:00
21031d11ed support docker node ps multiNodes
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 47e0458ffb
Component: cli
2017-06-02 00:10:11 +00:00
dadc5cd030 Add bash completion for docker stats --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8121d5a885
Component: cli
2017-06-02 00:10:11 +00:00
c1233b3b66 fix the man page and zsh completion for docker images
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: a64a1aa0ae
Component: cli
2017-06-02 00:10:11 +00:00
c0006d5967 add docker events --format
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 71e220fc11
Component: cli
2017-06-02 00:10:10 +00:00
2e3994446e Splunk Logging Driver performance improvements
New driver options:

- `splunk-gzip` - gzip compress all requests to Splunk HEC
(enabled by default)
- `splunk-gzip-level` - change compression level.

Messages are sent in batches by 1000, with frequency of 5 seconds.
Maximum buffer is 10,000 events. If HEC will not be available, Splunk
Logging Driver will keep retrying while it can hold messages in buffer.

Added unit tests for driver.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: db4e32d39e
Component: cli
2017-06-02 00:10:10 +00:00
e9c80957e0 Add zsh completion for 'service {create,update} --group-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 05f167e92a
Component: cli
2017-06-02 00:10:09 +00:00
2320ffdd73 Add bash completion for service {create,update} --group-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a45c6fc8bd
Component: cli
2017-06-02 00:10:09 +00:00
f3b4d86d17 Add completion for docker events -f event=health_status
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 894c3a5cbf
Component: cli
2017-06-02 00:10:08 +00:00
e71b9e2ff4 Remove bash completion for docker volume create --name
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a916015f46
Component: cli
2017-06-02 00:10:07 +00:00
1bcd95be4c make node ps default to self in swarm node
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4d1fc99027
Component: cli
2017-06-02 00:10:07 +00:00
0c05df52fc Replace zsh completion for 'docker volume create --name' by 'docker volume create {name}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1e95101ade
Component: cli
2017-06-02 00:10:07 +00:00
8610f5b17b Splunk Logging Driver: formats and verifyconnection
`--log-opt splunk-format=inline|json|raw` allows to change how logging
driver sends data to Splunk, where

`inline` - default value, format used before, message is injected as a
line in JSON payload
`json` - driver will try to parse each line as a JSON object and embed it
inside of the JSON payload
`raw` - driver will send Raw payload instead of JSON, tag and attributes
will be prefixed before the message

`--log-opt splunk-verify-connection=true|false` - allows to skip
verification for Splunk Url

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 7225cc5604
Component: cli
2017-06-02 00:10:06 +00:00
a80d76377d Update zsh and bash completion scripts.
This is to update the zsh and bash completion script for
23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: cebe3440af
Component: cli
2017-06-02 00:10:06 +00:00
17575bfacc expose RemovalInProgress in StateString #25652
Signed-off-by: timfeirg <kkcocogogo@gmail.com>
Upstream-commit: 280a6f9663
Component: cli
2017-06-02 00:10:06 +00:00
af4a044ed4 Add zsh completion for 'docker {network,volume} ls --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ab24559a62
Component: cli
2017-06-02 00:10:05 +00:00
6fcdf10549 Add zsh completion for 'docker volume ls --filter label'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1ccb0210f5
Component: cli
2017-06-02 00:10:05 +00:00
eb6bdab31c Add --no-trunc to service/node/stack ps output
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: b5c313651f
Component: cli
2017-06-02 00:10:05 +00:00
eb11d76559 Add bash completion for docker {network,volume} ls --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9b4b730adb
Component: cli
2017-06-02 00:10:05 +00:00
88a33913c8 Add bash completion for docker volume ls --filter label
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1cddc8ee68
Component: cli
2017-06-02 00:10:05 +00:00
3bf668411b add --format flag to docker info
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 420b6a91af
Component: cli
2017-06-02 00:10:05 +00:00
9c50b1990a Fix bash completion for docker service {create,update} {-e,--env}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 52dd4d9c5e
Component: cli
2017-06-02 00:10:04 +00:00
625c7ce560 Improve bash completion for docker swarm {init,join} --{advertise,listen}-addr}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6c4812f606
Component: cli
2017-06-02 00:10:04 +00:00
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