Commit Graph

536 Commits

Author SHA1 Message Date
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
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
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
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
614fc25c93 Merge pull request #24943 from aaronlehmann/rolling-updates
Add failure action for rolling updates
Upstream-commit: c65925f24baf98455c211b4eb5c408daaaefb07a
Component: engine
2016-07-25 10:15:28 -07:00
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
361aaddf98 Add zsh completion for 'docker swarm join-token' command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a04bba8b89f12480c4eaf0dda8f47442f99864ca
Component: engine
2016-07-25 08:39:33 +02:00
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
b141a44de0 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: 2cc5bd33eef038bf5721582e2410ba459bb656e9
Component: engine
2016-07-21 15:23:03 -07: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
708fdf6b4a Merge pull request #24828 from sdurrheimer/zsh-completion-node-update-label-add-rm
Add zsh completion for 'docker node update --label-{add,rm}'
Upstream-commit: 5527763f8cedbf5b23fe9063f30e9ed0b8d06f4c
Component: engine
2016-07-20 11:47:03 +02:00
7aace8a59b Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 45484f5458e3b4cf7996d4cb8481ed7e38982200
Component: engine
2016-07-20 09:18:59 +02:00
a2bd46cb48 Add zsh completion for 'docker node update --label-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cdb8383d7f4045a5cde0fe636f8fadb6560ba6cd
Component: engine
2016-07-20 09:11:16 +02: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
5c8645e25c Merge pull request #24705 from thaJeztah/update-flag-descriptions
Improve flag help consistency, and update docs
Upstream-commit: de64324109d2694b1525e62b5c0072267282a36c
Component: engine
2016-07-18 16:07:23 +00:00
3172da7b30 Merge pull request #24599 from vdemeester/small-zsh-completion-fix
Small zsh completion fix on --pretty & --no-resolve
Upstream-commit: ff1040bafc6a01d46c50b004f10d24a180c5f319
Component: engine
2016-07-16 02:55:32 +02:00
c4e34ed5c5 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: 64a8317a5a306dffd0ec080d9ec5b4ceb2479a01
Component: engine
2016-07-16 01:58:01 +02:00
13710c5963 Merge pull request #24668 from sdurrheimer/zsh-completion-service-endpoint-mode
Update zsh completion for 'docker service {create,update} {--endpoint…
Upstream-commit: 983fc995093e10ca816283debc136291e74d07fb
Component: engine
2016-07-15 14:40:45 +02:00
124e74e433 Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2e6922a6d3295857ae73fe7df7aa452d220f869d
Component: engine
2016-07-15 14:36:18 +02:00
9ee16a1c14 Merge pull request #24666 from sdurrheimer/zsh-completion-dockerd-oom-score-adjust
Add zsh completion for 'dockerd --oom-score-adjust'
Upstream-commit: a968f83c5583cf42008fcd88c5491946d6eb2dcd
Component: engine
2016-07-15 13:47:39 +02:00
9806cec69f Merge pull request #24667 from sdurrheimer/zsh-completion-docker-service-create-update-registry-auth
Add zsh completion for 'docker service {create,update} --registry-auth'
Upstream-commit: 2a888c02a65c483e51f5fc8cf462d3ec6a15ab47
Component: engine
2016-07-15 11:15:55 +02:00
9188889f22 Add zsh completion for 'docker service {create,update} --registry-auth'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 64f08906a2429ac0b2192e263ca86574f7f0dded
Component: engine
2016-07-15 08:23:57 +02:00
bc5b09206f Add zsh completion for 'dockerd --oom-score-adjust'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 5d29732bdf8f6b3a52a8272c4549982a95727ef8
Component: engine
2016-07-15 08:16:15 +02:00
a7e7e20b17 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: ba5d9f63a3b5c39fdbb89778782367a55ce74809
Component: engine
2016-07-15 08:09:20 +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
ccca651e58 Small zsh completion fix on --pretty & --no-resolve
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 698bd5ab65ddc3db9679aa27b79c89ba1ca1fe23
Component: engine
2016-07-13 22:03:11 +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
bc3a0408d7 Remove unmatched bracket from _docker for zsh
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
Upstream-commit: 7631dc80a6b1549b857192f44322fcee5e754254
Component: engine
2016-07-06 08:57:28 -07:00
1e37a43b53 Add zsh completion for 'docker service' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f5d768e2c53f777e1add70f0e367e58db561842e
Component: engine
2016-07-04 15:14:58 +02:00
c1be799486 Merge pull request #24276 from sdurrheimer/zsh-completion-daemon-add-runtime
Add zsh completion for 'docker daemon --runtimes' and 'docker run --r…
Upstream-commit: d97233ca886d50afd060f3a4fe584ac8e51ea998
Component: engine
2016-07-04 14:40:56 +02:00
6291373a90 Add zsh completion for 'docker plugin' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7ae3caa4e9762b5b74ed0885a3a2782531256281
Component: engine
2016-07-03 23:45:23 +02:00
99daf837b2 Add zsh completion for 'docker swarm' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2086663abdcfe793aeef3e64655df833c144d024
Component: engine
2016-07-03 23:28:38 +02:00
90180f1f3d Merge pull request #24272 from sdurrheimer/zsh-completion-node
Add zsh completion for 'docker node' commands
Upstream-commit: df3e3a227b8b8f93aa72673a09e7a83548b7c1b7
Component: engine
2016-07-03 13:58:14 -07:00