1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

338 Commits

Author SHA1 Message Date
Vincent Demeester
48a609d72c 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: 5280ba83e55b94b9d4973a15381e18eb10920233
Component: engine
2016-09-28 12:45:30 +02:00
Harald Albers
9c391e0cdf Fix bash completion for docker logs --since
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e2244352a79f5d23cf874d72b6abed9be2da9f8
Component: engine
2016-09-27 18:58:48 +02:00
Harald Albers
4d0761852a Add bash completion for docker stats --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ed0f53d7b6c64044a02e65251e92e7cac7f41c14
Component: engine
2016-09-21 20:19:14 +02:00
Sebastiaan van Stijn
14f9dd10a3 Merge pull request #26268 from AkihiroSuda/eventsjsonl
add `docker events --format`
Upstream-commit: bb6fe56e8847112e55429309bf3ac004753ae3a8
Component: engine
2016-09-19 17:30:27 +02:00
Michael Crosby
fc3c6766ab Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
Splunk Logging Driver performance improvements
Upstream-commit: efe4e914efe5f42a5b5e424ed519fda71343f7de
Component: engine
2016-09-16 10:22:09 -07:00
Akihiro Suda
e6635a948e add docker events --format
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 5af5a1be6209bde3f05b5f9ed4e0db0037dfe0ff
Component: engine
2016-09-15 09:55:29 +00:00
Denis Gladkikh
5099b8d2c1 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: 4907cc7793cf469fc2d6fc0f842d08bd045da569
Component: engine
2016-09-12 09:00:16 -07:00
Brian Goff
0b4dde90a0 Merge pull request #26301 from albers/completion-service-groups
Add bash completion for `service {create,update} --group-{add,rm}`
Upstream-commit: 5ada5f129f8c845c11daf8167a92c4c92d2b917c
Component: engine
2016-09-12 09:05:49 -04:00
Harald Albers
640335fb90 Add completion for docker events -f event=health_status
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d5a79579d38476121ff5ee49e74bdfd0d80a3bb7
Component: engine
2016-09-06 13:46:21 -07:00
Harald Albers
54fd9ae518 Add bash completion for service {create,update} --group-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: be455538aa452efa086df9e1a44045bab59c7a00
Component: engine
2016-09-04 05:52:50 -07:00
Harald Albers
6b40fbbd4d Remove bash completion for docker volume create --name
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7f9096adb7f5aa3845e256323c7f2107c04d2ff2
Component: engine
2016-08-31 09:50:11 +02:00
Alexander Morozov
a0d759f31d Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
Splunk Logging Driver: formats and verifyconnection
Upstream-commit: 78771b62255456bef110a3e310eb20165e5ece9f
Component: engine
2016-08-25 09:12:31 -07:00
Yong Tang
d30cc14f93 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: 7fd2c809622e66bb3157fbf1ab797152636a2df5
Component: engine
2016-08-18 18:41:15 -07:00
timfeirg
c8732c07e1 expose RemovalInProgress in StateString #25652
Signed-off-by: timfeirg <kkcocogogo@gmail.com>
Upstream-commit: 37466cc8c85ccbdade57463ae2aacac638002f8a
Component: engine
2016-08-18 11:25:27 +08:00
Denis Gladkikh
e85d8b261b 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: 603fd0831513257bc26d20ca1f64efcc4965eae6
Component: engine
2016-08-16 21:45:16 -07:00
Michael Crosby
06f36cfa80 Merge pull request #25337 from jhorwit2/jah/25332
Add --no-trunc to service/node/stack ps output
Upstream-commit: 0c8b0faef8dfb2aa97575bae8afa152e54e63492
Component: engine
2016-08-16 09:25:45 -07:00
Josh Horwitz
cff5a79975 Add --no-trunc to service/node/stack ps output
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
Upstream-commit: 204c4d39d3241cff1b44f438b99bd0d6484e7b48
Component: engine
2016-08-16 10:19:11 -04:00
Harald Albers
7494d4ad1a Add bash completion for docker {network,volume} ls --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5d43a78763d4cb435b080d607c4605591dfea67d
Component: engine
2016-08-16 14:10:28 +02:00
Sebastiaan van Stijn
48966e7c86 Merge pull request #25745 from albers/completion-volume-ls-filter-label
Add bash completion for `docker volume ls --filter label`
Upstream-commit: 0309eeb5ddd9733daa18ef07f7eea0dc3c53626e
Component: engine
2016-08-16 13:27:14 +02:00
Harald Albers
a80a4f000b Add bash completion for docker volume ls --filter label
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 41511f8911e48b1d0404ddc975243f5a6f303fb2
Component: engine
2016-08-16 09:10:46 +02:00
Akihiro Suda
1b140377f0 add --format flag to docker info
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: dc38c9a04705f0a9ad3e007f7869cfb6a8a3a8b8
Component: engine
2016-08-16 04:03:52 +00:00
Lei Jitang
8efb4bf7c6 Merge pull request #25442 from albers/completion--env
Fix bash completion for `docker service {create,update} {-e,--env}`
Upstream-commit: b72a41b32e683a9d4cb780e3f937e4959447ece0
Component: engine
2016-08-06 10:47:18 +08:00
Vincent Demeester
f00255fe74 Merge pull request #25447 from albers/completion-swarm-interfaces
Improve bash completion for `docker swarm {init,join} --{advertise,listen}-addr}`
Upstream-commit: 54e2cbc11e956863413859f492194a3dfcdd5646
Component: engine
2016-08-05 19:59:32 +02:00
Brian Goff
25b29d1992 Merge pull request #25448 from albers/completion-swarm-join--adveritse-addr
Fix bash completion for `docker swarm join --advertise-addr`
Upstream-commit: e9bfb9b4cbec2b3e7120a2775b74a7c4e3088397
Component: engine
2016-08-05 13:50:26 -04:00
Harald Albers
1e65234473 Fix bash completion for docker swarm join --advertise-addr
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fa1b82e5ebc0e7dafe500e891c8b8c5fe5d4e1aa
Component: engine
2016-08-05 19:14:13 +02:00
Harald Albers
a4f26f26fe Improve bash completion for docker swarm {init,join} --{advertise,listen}-addr}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 07f6655286f5e383dba5063bf0dcf2ee02d5e52f
Component: engine
2016-08-05 18:56:17 +02:00
Harald Albers
fe75792b8d Add self to bash completion of docker node inspect
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b63a7692d6c656cfa1081e36de7be690fd007385
Component: engine
2016-08-05 18:06:25 +02:00
Harald Albers
fd0981c83c Fix bash completion for docker service {create,update} {-e,--env}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 197f23da497d3d82f30beb6d920211f6d2055fa3
Component: engine
2016-08-05 17:41:40 +02:00
Harald Albers
7e61c1351f Add bash completion for docker node rm --force
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 46d3464362f18a1eb6d37fc51b120d0f0614653a
Component: engine
2016-08-03 11:08:28 +02:00
Stephen J Day
6a1ceaa1e1 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: 0aa4e1e68973ede0c73f8a4356e2a17fc903f549
Component: engine
2016-07-27 11:06:42 -07:00
Sebastiaan van Stijn
ed486e4e8a Merge pull request #25060 from albers/completion-swarm-inspect
Remove bash completion for `docker swarm inspect`
Upstream-commit: 00295c4bb3e1399d3e0edd89a1ae52c1bcf2e28e
Component: engine
2016-07-26 13:56:11 +02:00
Harald Albers
6b65af2d20 Remove bash completion for docker swarm inspect
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 34d9a8240914d30f3a8fe28c1b7d1d4e36d0657b
Component: engine
2016-07-26 04:51:27 -07:00
Harald Albers
6776aff799 bash completion for container labels to service {create,update}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 13c138ec2a896a87da8fa81693975e7ffbec85fd
Component: engine
2016-07-26 04:45:57 -07:00
Aaron Lehmann
f72c6bff06 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: 57ae29aa74e77ade3c91b1c77ba766512dae9ab4
Component: engine
2016-07-25 08:51:19 -07:00
Aaron Lehmann
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
Tibor Vass
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
Vincent Demeester
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
Harald Albers
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Harald Albers
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
Harald Albers
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
Sebastiaan van Stijn
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
Harald Albers
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
Harald Albers
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
Sebastiaan van Stijn
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
Harald Albers
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
Sebastiaan van Stijn
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
Arnaud Porterie
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
Vincent Demeester
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