Commit graph

933 commits

Author SHA1 Message Date
Steve Durrheimer
d3305a17e1
Move zsh completion logic to new subcommand: build
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:07 +01:00
Steve Durrheimer
53a56990c4
Add zsh completion for 'docker image' subcommands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:15:05 +01:00
Steve Durrheimer
2a44da9732
Rename zsh images & log complete functions
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-09 08:14:40 +01:00
Aaron Lehmann
842d11f44c cli: Add options for Raft snapshotting
Add the following options to "swarm init" and "swarm update":

- --max-snapshots: Retain this many old Raft snapshots in addition
  to the latest one

- --snapshot-interval: Number of log entries between Raft snapshots

These options already existed in SwarmKit and the Docker API but were
never exposed in the CLI. I'm adding them here to fix this oversight.

--max-snapshots may be useful for debugging purposes and more
conservative users who want to store rolling backups of old versions of
the Raft state.

--snapshot-interval is most useful for performance tuning. The default
value of 10000 may not be ideal for some setups.

There is also a LogEntriesForSlowFollowers option that is not exposed. I
decided not to expose it along with these others because I don't think
it's generally useful (and I'm not sure what I would call the CLI flag).
But if people want, I can expose it for the sake of completeness.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-08 13:14:01 -08:00
Vincent Demeester
d46c7109b5 Merge pull request #27888 from sdurrheimer/zsh-completion-container-subcommand
Add zsh completion for new 'docker container' subcommands
2016-11-08 11:24:28 +01:00
Harald Albers
bfd8f7a7e1 Add bash completion for docker service {create,update} --tty
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-08 09:13:23 +01:00
Akihiro Suda
de78ed432b Merge pull request #28093 from albers/completion-run--cpus
Add bash completion for `docker {run,create} --cpus`
2016-11-07 17:31:40 +09:00
Akihiro Suda
67a247154c Merge pull request #28094 from albers/completion-system-df
Add bash completion for `docker system df`
2016-11-07 17:31:27 +09:00
Vincent Demeester
afb1119c85 Merge pull request #28096 from albers/completion-prune
Add bash completion for new prune commands
2016-11-07 09:30:56 +01:00
Harald Albers
d65934a8b8 Fix bash completion for docker inspect --type
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-05 11:22:47 -07:00
Harald Albers
8099280cd8 Add bash completion for new prune commands
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-05 10:39:33 -07:00
Harald Albers
09172051fc Add bash completion for docker system df
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-05 10:12:35 -07:00
Harald Albers
9268bbaeea Add bash completion for docker {run,create} --cpus
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-05 09:59:55 -07:00
Harald Albers
42f8562984 Add bash completion for docker service create --hostname
Signed-off-by: Harald Albers <github@albersweb.de>
2016-11-04 19:08:17 +01:00
Steve Durrheimer
94863d8c63
Cleanup after moving all zsh completion logics for the new container command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:16 +01:00
Steve Durrheimer
6a662de965
Move zsh completion logic to new subcommand: wait
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:13 +01:00
Steve Durrheimer
b25603391c
Move zsh completion logic to new subcommand: update
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:12 +01:00
Steve Durrheimer
07a3ccec0a
Move zsh completion logic to new subcommand: top
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:10 +01:00
Steve Durrheimer
6aff1be430
Move zsh completion logic to new subcommand: stop
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:09 +01:00
Steve Durrheimer
d0e4f7fbe6
Move zsh completion logic to new subcommand: stats
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:07 +01:00
Steve Durrheimer
8e5285c283
Move zsh completion logic to new subcommand: start
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:05 +01:00
Steve Durrheimer
dcc5b72020
Move zsh completion logic to new subcommand: run
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:04 +01:00
Steve Durrheimer
1df32a4f6c
Move zsh completion logic to new subcommand: rm
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:02 +01:00
Steve Durrheimer
64b546e7b8
Move zsh completion logic to new subcommand: restart
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:55:01 +01:00
Steve Durrheimer
fc6bd22725
Move zsh completion logic to new subcommand: rename
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:59 +01:00
Steve Durrheimer
4ffc37224d
Move zsh completion logic to new subcommand: port
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:58 +01:00
Steve Durrheimer
e602bfbc34
Move zsh completion logic to new subcommand: pause, unpause
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:56 +01:00
Steve Durrheimer
44bb318161
Move zsh completion logic to new subcommand: ps
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:55 +01:00
Steve Durrheimer
28bd616212
Move zsh completion logic to new subcommand: logs
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:53 +01:00
Steve Durrheimer
45fdea257c
Move zsh completion logic to new subcommand: kill
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:51 +01:00
Steve Durrheimer
e5424b656b
Add zsh completion logic to new subcommand: inspect
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:50 +01:00
Steve Durrheimer
911ef73ee1
Move zsh completion logic to new subcommand: export
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:48 +01:00
Steve Durrheimer
ee27e97218
Move zsh completion logic to new subcommand: exec
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:47 +01:00
Steve Durrheimer
0632c34439
Move zsh completion logic to new subcommand: diff
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:45 +01:00
Steve Durrheimer
abf2f0087d
Move zsh completion logic to new subcommand: create
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:44 +01:00
Steve Durrheimer
b067a59bfd
Move zsh completion logic to new subcommand: cp
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:42 +01:00
Steve Durrheimer
89737ea253
Move zsh completion logic to new subcommand: commit
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:40 +01:00
Steve Durrheimer
d5ca5c1e08
Move zsh completion logic to new subcommand: attach
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:39 +01:00
Steve Durrheimer
a9443b7388
Add zsh completion for 'docker container' subcommands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:37 +01:00
Steve Durrheimer
431e9cb27c
Rename containers complete function in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-11-04 08:54:27 +01:00
Sebastiaan van Stijn
6b3b9d53e1 Merge pull request #28021 from YuPengZTE/devString
Add “” for String
2016-11-03 17:03:56 -07:00
yupeng
167daf5060 Add for String
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-03 16:15:26 +08:00
Akihiro Suda
273eeb813c cli: add --mount to docker run
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-11-03 07:08:59 +00:00
Sebastiaan van Stijn
11605903d0 Merge pull request #27746 from Microsoft/jjh/pscompletion
Redirect powershell completion
2016-11-02 19:08:38 -07:00
Sebastiaan van Stijn
d83f56ee5f Merge pull request #27979 from allencloud/more-specific-in-service-scale-description
add replicated in service scale command description
2016-11-02 18:01:59 -07:00
allencloud
002262d6f5 node rm can be applied on not only active node
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-02 17:22:04 +08:00
allencloud
b9fdbbad61 add replicated in service scale command description
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-02 16:15:57 +08:00
Vincent Demeester
17aaa0890a Merge pull request #27879 from sdurrheimer/zsh-completion-ps-health-filter
Add zsh completion for 'docker ps --filter health='
2016-10-29 19:23:55 +02:00
Harald Albers
5e6a59b59f Add bash completion for docker ps --filter health
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-29 04:26:08 -07:00
Steve Durrheimer
8df3d6a2a7
Add zsh completion for 'docker ps --filter health='
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-29 12:13:29 +02:00
Lily Guo
2f58494ae6 Service create --group param
--group-add was used for specifying groups for both service create
and service update. For create it was confusing since we don't have
an existing set of groups. Instead I added --group to create, and
moved --group-add to service update only, like --group-rm
This deals with issue 27646

Signed-off-by: Lily Guo <lily.guo@docker.com>

Update flag documentation

Specify that --group, --group-add and --groupd-rm refers to
supplementary user groups

Signed-off-by: Lily Guo <lily.guo@docker.com>

Fix docs for groups and update completion scripts

Signed-off-by: Lily Guo <lily.guo@docker.com>
2016-10-28 13:26:31 -07:00
Vincent Demeester
f860289131 Merge pull request #27369 from cezarsa/hc
Add --health-* flags to service create and update
2016-10-28 21:59:52 +02:00
Michael Crosby
9842f019ec Merge pull request #27731 from albers/completion-export--output
Add bash completion for `docker export --output`
2016-10-28 10:59:05 -07:00
Michael Crosby
a52b9b4591 Merge pull request #27732 from albers/completion-pause-multiple-containers
Add support for multiple containers to bash completion for `docker pause`
2016-10-28 10:58:34 -07:00
Cezar Sa Espinola
7bd2611789
Add --health-* commands to service create and update
A HealthConfig entry was added to the ContainerSpec associated with the
service being created or updated.

Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
2016-10-28 15:19:08 -02:00
Vincent Demeester
1462ea37d0 Merge pull request #27856 from albers/completion-service-create--env-file
Add bash completion for `docker service create --env-file`
2016-10-28 19:00:06 +02:00
Harald Albers
b2db0cdae7 Add bash completion for docker service create --env-file
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-28 12:53:32 +02:00
Steve Durrheimer
60813045c1
Add zsh completion for 'docker service create --env-file'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-28 08:10:42 +02:00
Vincent Demeester
89011970e0 Merge pull request #27654 from gaocegege/add-quiet-mode-to-service-ps
Add -q option to `docker service ps`
2016-10-28 05:21:03 +02:00
Ce Gao
9efa472bd1 fixes #27643
Signed-off-by: Ce Gao <ce.gao@outlook.com>
2016-10-28 08:02:57 +08:00
Sebastiaan van Stijn
3a3a87bff8 Merge pull request #26988 from thaJeztah/remove-service-update-name-flag
Remove service update name flag
2016-10-27 16:55:47 -07:00
Sebastiaan van Stijn
047e44eeb1 Remove --name flag from service update
The --name flag was inadvertently added to
docker service update, but is not supported,
as it has various side-effects (e.g., existing
tasks are not renamed).

This removes the flag from the service update
command.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-10-27 09:16:29 -07:00
Harald Albers
a3efa05d3a Move bash completion logic to new subcommand: info
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-27 09:10:39 +02:00
Harald Albers
1de8e84a5c Move bash completion logic to new subcommand: events
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-27 09:08:18 +02:00
Harald Albers
5290f74878 Add bash completion for new docker system command family
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-27 09:05:21 +02:00
Vincent Demeester
362eb4cfbb Merge pull request #27719 from albers/completion-image
Add bash completion for new `docker image` command family
2016-10-27 00:41:26 +02:00
Vincent Demeester
80d6d2e129 Merge pull request #23430 from erikstmartin/realtime-threads
Implementing support for --cpu-rt-period and --cpu-rt-runtime
2016-10-27 00:22:06 +02:00
Brian Goff
2a2f183627 Merge pull request #27724 from sdurrheimer/zsh-completion-dockerd-experimental
Add zsh completion for 'dockerd --experimental'
2016-10-26 09:02:27 -07:00
Erik St. Martin
56f77d5ade Implementing support for --cpu-rt-period and --cpu-rt-runtime so that
containers may specify these cgroup values at runtime. This will allow
processes to change their priority to real-time within the container
when CONFIG_RT_GROUP_SCHED is enabled in the kernel. See #22380.

Also added sanity checks for the new --cpu-rt-runtime and --cpu-rt-period
flags to ensure that that the kernel supports these features and that
runtime is not greater than period.

Daemon will support a --cpu-rt-runtime flag to initialize the parent
cgroup on startup, this prevents the administrator from alotting runtime
to docker after each restart.

There are additional checks that could be added but maybe too far? Check
parent cgroups to ensure values are <= parent, inspecting rtprio ulimit
and issuing a warning.

Signed-off-by: Erik St. Martin <alakriti@gmail.com>
2016-10-26 11:33:06 -04:00
John Howard
65fdbf0210 Redirect powershell completion
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-10-25 09:48:53 -07:00
Vincent Demeester
95b459df6d Merge pull request #27716 from sdurrheimer/zsh-completion-daemon-shutdown-timeout
Add zsh completion for 'dockerd --shutdown-timeout'
2016-10-25 08:58:34 -07:00
Vincent Demeester
c851aea2b6 Merge pull request #27715 from sdurrheimer/zsh-completion-create-run-stop-timeout
Add zsh completion for 'docker {create,run} --stop-timeout'
2016-10-25 08:58:18 -07:00
Kenfe-Mickaël Laventure
9643f0e816 Merge pull request #27721 from albers/completion-dockerd--experimental
Add bash completion for `dockerd --experimental`
2016-10-25 07:10:23 -07:00
Harald Albers
2e44e74874 Add support for multiple containers to bash completion for docker pause
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 14:24:59 +02:00
Harald Albers
3ac19862f2 Add bash completion for docker export --output
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 14:18:13 +02:00
Steve Durrheimer
11b6c4c58a
Add zsh completion for 'dockerd --experimental'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-25 11:26:39 +02:00
Harald Albers
e63f196536 Add bash completion for dockerd --experimental
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 10:04:48 +02:00
Harald Albers
28469b5720 Move bash completion logic to new subcommand: tag
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers
18e8c59fbb Move bash completion logic to new subcommand: save
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers
01c259e08a Move bash completion logic to new subcommand: rmi
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers
2d139df59c Move bash completion logic to new subcommand: push
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers
6864f3ae5a Move bash completion logic to new subcommand: pull
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers
df486631bc Move bash completion logic to new subcommand: images
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers
75aede3a7c Move bash completion logic to new subcommand: load
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:47 +02:00
Harald Albers
9eb1f55402 Delegate bash completion for docker {container,image} inspect to parameterized function
In #23614 `docker inspect` was semantically enhanced to inspect "everything".
Therefore moving its logic to `_docker_container_inspect` was not correct.

This commit moves it back to its original top-level location (`_docker_inspect`)
so that it can be called by `_docker_{container,image}_inspect` and others (will
be added in follow-up PRs).
Parameterization was added in order to get caller-specific behavior.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-25 09:57:38 +02:00
Steve Durrheimer
94b6376ee5
Fix zsh completion for 'docker exec --env'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-25 09:05:07 +02:00
Steve Durrheimer
20890b4aad
Add zsh completion for 'dockerd --shutdown-timeout'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-25 08:59:23 +02:00
Steve Durrheimer
34f5d97468
Add zsh completion for 'docker {create,run} --stop-timeout'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-25 08:55:00 +02:00
Harald Albers
e93298650d Move bash completion logic to new subcommand: import
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-24 01:37:52 -07:00
Harald Albers
9059b9532e Move bash completion logic to new subcommand: history
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-24 01:37:52 -07:00
Harald Albers
db31883a92 Move bash completion logic to new subcommand: build
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-24 01:37:52 -07:00
Harald Albers
33910a89b9 Add bash completion for new docker image command family
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-24 01:37:52 -07:00
Harald Albers
4126229741 Fix bash completion for docker exec --env
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-22 08:14:59 -07:00
Aaron Lehmann
c9fdf9abf8 Add force option to service update
Currently, there's no way to restart the tasks of a service without
making an actual change to the service. This leads to us giving awkward
workarounds as in
https://github.com/docker/docker.github.io/pull/178/files, where we tell
people to scale a service up and down to restore balance, or make
unnecessary changes to trigger a restart.

This change adds a --force option to "docker service update", which
forces the service to be updated even if no changes require that.

Since rolling update parameters are respected, the user can use
"docker service --force" to do a rolling restart. For example, the
following is supported:

   docker service update --force --update-parallelism 2 \
   --update-delay 5s myservice

Since the default value of --update-parallelism is 1, the default
behavior is to restart the service one task at a time.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-21 17:43:27 -07:00
Harald Albers
93ccf95db1 Move bash completion logic to new subcommand: wait
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
f9a24c72ba Move bash completion logic to new subcommand: update
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
6ac201721f Move bash completion logic to new subcommand: unpause
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
4bab104761 Move bash completion logic to new subcommand: top
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
150dcabc0f Move bash completion logic to new subcommand: stop
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
19f31f8e48 Move bash completion logic to new subcommand: stats
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
2bbfd01e7a Move bash completion logic to new subcommand: start
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
5200d18dbf Move bash completion logic to new subcommand: run
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
9fc4670b3b Move bash completion logic to new subcommand: rm
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
58027826d4 Move bash completion logic to new subcommand: restart
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
96547d0e88 Move bash completion logic to new subcommand: port
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
48e75d4bc2 Move bash completion logic to new subcommand: port
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
27abd03059 Move bash completion logic to new subcommand: pause
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
a91fb558d2 Move bash completion logic to new subcommand: ps
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
4dedad3118 Move bash completion logic to new subcommand: logs
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
f1e12a4951 Move bash completion logic to new subcommand: kill
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
3cd9f22664 Move bash completion logic to new subcommand: inspect
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
3b6f6611b0 Move bash completion logic to new subcommand: diff
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
8fde0d7f2b Move bash completion logic to new subcommand: exec
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:39:32 +02:00
Harald Albers
f15debe56c Move bash completion logic to new subcommand: diff
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:32:08 +02:00
Harald Albers
cd4a490b3f Move bash completion logic to new subcommand: create
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:32:08 +02:00
Harald Albers
939a97f7ac Move bash completion logic to new subcommand: cp
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:32:08 +02:00
Harald Albers
6a0dff0a9a Move bash completion logic to new subcommand: commit
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:32:08 +02:00
Harald Albers
dc5794b306 Move bash completion logic to new subcommand: attach
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:32:08 +02:00
Harald Albers
a77bc8bbcf Add bash completion for docker container
At this point, we just delegate to the existing completions.

Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-21 12:32:08 +02:00
Vincent Demeester
1b677816f5 Merge pull request #24594 from jwendell/24355
Exec: Add ability to set environment variables
2016-10-20 13:26:48 +02:00
Sebastiaan van Stijn
f6e9f71e70 Merge pull request #27451 from vincentbernat/fix/zsh-complete-empty
zsh: fix completion when docker output only has the header line
2016-10-19 23:34:16 -07:00
Sebastiaan van Stijn
5023d3aa7a Merge pull request #27542 from albers/completion-comments
Improve comments in bash completion
2016-10-19 20:36:40 -07:00
Harald Albers
c24c1bd87f Add bash completion for dockerd --shutdown-timeout
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-19 18:59:01 +02:00
Jonh Wendell
e03bf1221e Exec: Add ability to set environment variables
Keeping the current behavior for exec, i.e., inheriting
variables from main process. New variables will be added
to current ones. If there's already a variable with that
name it will be overwritten.

Example of usage: docker exec -it -e TERM=vt100 <container> top

Closes #24355.

Signed-off-by: Jonh Wendell <jonh.wendell@redhat.com>
2016-10-19 12:39:25 -02:00
Harald Albers
b0987b799e Improve comments in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-19 15:35:56 +02:00
Vincent Demeester
ff43982fbb Merge pull request #27316 from albers/completion-plugins
Align bash completion of plugins to completion of nodes and services
2016-10-19 12:17:12 +02:00
Sebastiaan van Stijn
3b0660da30 Merge pull request #26421 from aaronlehmann/update-thresholds-rollbacks
Service update failure thresholds and rollback
2016-10-18 15:26:24 -07:00
Daniel Nephin
701cd7996f Merge pull request #27492 from albers/completion-run--stop-timeout
Add bash completion for `docker {run,create} --stop-timeout`
2016-10-18 17:22:47 -04:00
Tianon Gravi
f803114833 Merge pull request #27348 from albers/completion-containers
Improve bash completion of containers
2016-10-18 13:31:47 -07:00
Sebastiaan van Stijn
b17107a84a Merge pull request #27235 from albers/completion-networks
Align bash completion of networks to completion of nodes and services
2016-10-18 13:30:01 -07:00
Tianon Gravi
29cc38da53 Merge pull request #27239 from albers/completion-volumes
Align bash completion of volumes to completion of nodes and services
2016-10-18 12:27:59 -07:00
Aaron Lehmann
6d4b527699 Service update failure thresholds and rollback
This adds support for two enhancements to swarm service rolling updates:

- Failure thresholds: In Docker 1.12, a service update could be set up
  to either pause or continue after a single failure occurs. This adds
  an --update-max-failure-ratio flag that controls how many tasks need to
  fail to update for the update as a whole to be considered a failure. A
  counterpart flag, --update-monitor, controls how long to monitor each
  task for a failure after starting it during the update.

- Rollback flag: service update --rollback reverts the service to its
  previous version. If a service update encounters task failures, or
  fails to function properly for some other reason, the user can roll back
  the update.

SwarmKit also has the ability to roll back updates automatically after
hitting the failure thresholds, but we've decided not to expose this in
the Docker API/CLI for now, favoring a workflow where the decision to
roll back is always made by an admin. Depending on user feedback, we may
add a "rollback" option to --update-failure-action in the future.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-10-18 10:09:50 -07:00
Harald Albers
38dc610609 Add bash completion for docker {run,create} --stop-timeout
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-18 15:24:28 +02:00
Sebastiaan van Stijn
24582e8153 Merge pull request #27471 from caarlos0/logentries
Added Logentries Driver
2016-10-18 01:33:28 -07:00
Carlos Alexandro Becker
0f4db1cc59
Added logentries dependency to vendor
Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
2016-10-17 22:06:39 -02:00
Harald Albers
b6237a8550 Improve bash completion of containers
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-17 19:10:48 +02:00
Vincent Bernat
44b83c56b6 zsh: fix completion when docker output only has the header line
Unfortunately, `(f)` aka `(ps:\n:)` flag will not create an array when
there is only one line. The subsequent use of indexes will then affect
the string. This leads to `docker rmi <tab>` to complete on the header
line instead of nothing.

Therefore, for each use of `(f)`, we ensure that we have an extra new
line to be sure we get an array.

Credit to @povesteam for the original report and fix in #27373.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
2016-10-17 17:23:09 +02:00
Harald Albers
adbb943200 Align bash completion of plugins to completion of nodes and services
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-12 05:29:26 -07:00
Vincent Demeester
6b997739fe Merge pull request #26970 from wzhliang/restart-stopped-container
zsh: allow restarting stopped containers by id
2016-10-11 14:37:54 +02:00
Harald Albers
06d4c11760 Align bash completion of volumes to completion of nodes and services
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-09 04:46:20 -07:00
Harald Albers
5207fe75ae Align bash completion of networks to completion of nodes and services
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-08 10:50:31 -07:00
Steve Durrheimer
3db5222340
Add zsh completion for 'dockerd --init-path'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-10-06 07:38:39 +02:00
Alexander Morozov
f08a450ad3 Merge pull request #25837 from reaperhulk/support-compressing-build-context
Add support for compressing build context during image build
2016-10-05 12:57:46 -07:00
Sebastiaan van Stijn
367d5b0232 Merge pull request #27097 from albers/completion-node-ps-multiple-nodes
Add support for multiple nodes in bash completion for `docker node ps`
2016-10-02 14:38:46 +02:00
Harald Albers
9aeb69a069 Add support for multiple nodes in bash completion for docker node ps
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-02 05:18:32 -07:00
Harald Albers
d710a3e1f8 Add bash completion for dockerd --init-path
Signed-off-by: Harald Albers <github@albersweb.de>
2016-10-02 05:10:00 -07:00
Paul Kehrer
4825e58a96 Add support for compressing build context during image build
When sending a build context to a remote server it may be
(significantly) advantageous to compress the build context. This commit
adds support for gz compression when constructing a build context
using a command like "docker build --compress ."

Signed-off-by: Paul Kehrer <paul.l.kehrer@gmail.com>
2016-09-30 17:46:08 -05:00
Vincent Demeester
5280ba83e5
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>
2016-09-28 12:45:30 +02:00
Wenzhi Liang
568aa9675c allow restarting stopped containers by id
Signed-off-by: Wenzhi Liang <wenzhi.liang@gmail.com>
2016-09-28 11:27:11 +08:00
Harald Albers
0e2244352a Fix bash completion for docker logs --since
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-27 18:58:48 +02:00
Brian Goff
285a9d5e35 Merge pull request #26909 from sdurrheimer/zsh-completion-stats-format
Add zsh completion for 'docker stats --format'
2016-09-26 10:32:52 -04:00
Steve Durrheimer
d918fc8e08
Add zsh completion for multi-nodes 'node ps'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-09-26 09:16:16 +02:00
Steve Durrheimer
7aa600dffb
Add zsh completion for 'docker stats --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-09-26 09:10:29 +02:00
Vincent Demeester
c03c80b1b0 Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes
support docker node ps multiNodes
2016-09-23 09:50:24 +02:00
Harald Albers
ed0f53d7b6 Add bash completion for docker stats --format
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-21 20:19:14 +02:00
Vincent Demeester
be9e3f59e6 Merge pull request #26270 from AkihiroSuda/fix-typo-docker-images
[nit] fix the man page and zsh completion for `docker images`
2016-09-20 15:56:23 +02:00
Sebastiaan van Stijn
bb6fe56e88 Merge pull request #26268 from AkihiroSuda/eventsjsonl
add `docker events --format`
2016-09-19 17:30:27 +02:00
Michael Crosby
efe4e914ef Merge pull request #26207 from splunk/splunk-logging-driver-performance-improvements
Splunk Logging Driver performance improvements
2016-09-16 10:22:09 -07:00
Akihiro Suda
5af5a1be62 add docker events --format
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-15 09:55:29 +00:00
Vincent Demeester
0deae9f2fa Merge pull request #26478 from sdurrheimer/zsh-completion-service-group-add-rm
Add zsh completion for 'service {create,update} --group-{add,rm}'
2016-09-13 10:18:27 +02:00
Steve Durrheimer
1df220d51f
Add zsh completion for 'service {create,update} --group-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-09-13 10:15:22 +02:00
Denis Gladkikh
4907cc7793 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>
2016-09-12 09:00:16 -07:00
Brian Goff
5ada5f129f Merge pull request #26301 from albers/completion-service-groups
Add bash completion for `service {create,update} --group-{add,rm}`
2016-09-12 09:05:49 -04:00
allencloud
af4461ad29 support docker node ps multiNodes
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-09-10 02:52:48 +08:00
Harald Albers
d5a79579d3 Add completion for docker events -f event=health_status
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-06 13:46:21 -07:00
Harald Albers
be455538aa Add bash completion for service {create,update} --group-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-04 05:52:50 -07:00
Akihiro Suda
f3d9214d0b fix the man page and zsh completion for docker images
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-02 09:52:10 +00:00
Harald Albers
7f9096adb7 Remove bash completion for docker volume create --name
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-31 09:50:11 +02:00
allencloud
b13f5dfd13 make node ps default to self in swarm node
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-30 17:34:16 +08:00
Steve Durrheimer
85071bda33
Replace zsh completion for 'docker volume create --name' by 'docker volume create {name}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-28 12:40:10 +02:00
Alexander Morozov
78771b6225 Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
Splunk Logging Driver: formats and verifyconnection
2016-08-25 09:12:31 -07:00
Yong Tang
7fd2c80962 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>
2016-08-18 18:41:15 -07:00
Vincent Demeester
426046db3a Merge pull request #25708 from timfeirg/master
expose RemovalInProgress in StateString #25652
2016-08-18 21:54:48 +02:00
timfeirg
37466cc8c8 expose RemovalInProgress in StateString #25652
Signed-off-by: timfeirg <kkcocogogo@gmail.com>
2016-08-18 11:25:27 +08:00
Sebastiaan van Stijn
2ae49a0887 Merge pull request #25789 from sdurrheimer/zsh-completion-network-volume-ls-format
Add zsh completion for 'docker {network,volume} ls --format'
2016-08-17 16:51:51 +02:00
Steve Durrheimer
25009687be
Add zsh completion for 'docker {network,volume} ls --format'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-17 08:21:15 +02:00
Steve Durrheimer
d1870019a0
Add zsh completion for 'docker volume ls --filter label'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-17 08:15:26 +02:00
Denis Gladkikh
603fd08315 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>
2016-08-16 21:45:16 -07:00
Michael Crosby
0c8b0faef8 Merge pull request #25337 from jhorwit2/jah/25332
Add --no-trunc to service/node/stack ps output
2016-08-16 09:25:45 -07:00
Josh Horwitz
204c4d39d3 Add --no-trunc to service/node/stack ps output
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
2016-08-16 10:19:11 -04:00
Harald Albers
5d43a78763 Add bash completion for docker {network,volume} ls --format
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-16 14:10:28 +02:00
Sebastiaan van Stijn
0309eeb5dd Merge pull request #25745 from albers/completion-volume-ls-filter-label
Add bash completion for `docker volume ls --filter label`
2016-08-16 13:27:14 +02:00
Harald Albers
41511f8911 Add bash completion for docker volume ls --filter label
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-16 09:10:46 +02:00
Akihiro Suda
dc38c9a047 add --format flag to docker info
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-08-16 04:03:52 +00:00
Lei Jitang
b72a41b32e Merge pull request #25442 from albers/completion--env
Fix bash completion for `docker service {create,update} {-e,--env}`
2016-08-06 10:47:18 +08:00
Vincent Demeester
54e2cbc11e Merge pull request #25447 from albers/completion-swarm-interfaces
Improve bash completion for `docker swarm {init,join} --{advertise,listen}-addr}`
2016-08-05 19:59:32 +02:00
Brian Goff
e9bfb9b4cb Merge pull request #25448 from albers/completion-swarm-join--adveritse-addr
Fix bash completion for `docker swarm join --advertise-addr`
2016-08-05 13:50:26 -04:00
Harald Albers
fa1b82e5eb Fix bash completion for docker swarm join --advertise-addr
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 19:14:13 +02:00
Harald Albers
07f6655286 Improve bash completion for docker swarm {init,join} --{advertise,listen}-addr}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 18:56:17 +02:00
Harald Albers
b63a7692d6 Add self to bash completion of docker node inspect
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 18:06:25 +02:00
Harald Albers
197f23da49 Fix bash completion for docker service {create,update} {-e,--env}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-05 17:41:40 +02:00
Steve Durrheimer
b58ef479a6
Add zsh completion for 'docker node rm --force'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-08-04 08:01:04 +02:00
Harald Albers
46d3464362 Add bash completion for docker node rm --force
Signed-off-by: Harald Albers <github@albersweb.de>
2016-08-03 11:08:28 +02:00
allencloud
6c5988ed8c update command description in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-31 00:06:18 +08:00
Sebastiaan van Stijn
3b7ea4d8c3 Merge pull request #25208 from sdurrheimer/zsh-completion-service-create-update-container-labels
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}
2016-07-29 09:59:46 +02:00
Steve Durrheimer
ab95ec3dd9
Add zsh completion for 'docker service {create,update} --container-label{-add,-rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-29 07:54:10 +02:00
Steve Durrheimer
f146f6127c
Remove zsh completion for 'docker swarm inspect'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-29 07:41:27 +02:00
Stephen J Day
0aa4e1e689
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>
2016-07-27 11:06:42 -07:00
Sebastiaan van Stijn
00295c4bb3 Merge pull request #25060 from albers/completion-swarm-inspect
Remove bash completion for `docker swarm inspect`
2016-07-26 13:56:11 +02:00
Harald Albers
34d9a82409 Remove bash completion for docker swarm inspect
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-26 04:51:27 -07:00
Harald Albers
13c138ec2a bash completion for container labels to service {create,update}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-26 04:45:57 -07:00
Tibor Vass
c65925f24b Merge pull request #24943 from aaronlehmann/rolling-updates
Add failure action for rolling updates
2016-07-25 10:15:28 -07:00
Aaron Lehmann
57ae29aa74 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>
2016-07-25 08:51:19 -07:00
Steve Durrheimer
a04bba8b89
Add zsh completion for 'docker swarm join-token' command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-25 08:39:33 +02:00
Aaron Lehmann
a0ccd0d42f 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>
2016-07-24 09:23:07 -07:00
Tibor Vass
771cf83807 Merge pull request #24934 from albers/completion-swarm-join-token
bash completion for `docker swarm join-token`
2016-07-22 11:24:25 -07:00
Vincent Demeester
97039324c0 Merge pull request #24885 from vdemeester/24875-registrauth-with
Rename `--registry-auth` to `--with-registry-auth`
2016-07-22 19:05:49 +02:00
Harald Albers
42b4d6ebe4 bash completion for docker swarm join-token
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-22 17:39:55 +02:00
Sebastiaan van Stijn
c4ab20c5f8
remove "secrets" from completion scripts
Swarm join has been changed in f5e1f6f688,
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>
2016-07-22 14:26:21 +02:00
Vincent Demeester
8426f72107
Append --registry-auth with with
`--with-registry-auth` is more explicit.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-22 10:38:56 +02:00
Aaron Lehmann
2cc5bd33ee 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>
2016-07-21 15:23:03 -07:00
Harald Albers
6c98d5bfac Add manual support for macvlan networks to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-20 13:13:14 -07:00
Harald Albers
492fdf1f57 Update completions for syslog log driver options
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-20 12:35:04 -07:00
Vincent Demeester
5527763f8c Merge pull request #24828 from sdurrheimer/zsh-completion-node-update-label-add-rm
Add zsh completion for 'docker node update --label-{add,rm}'
2016-07-20 11:47:03 +02:00
Steve Durrheimer
45484f5458
Add zsh completion for 'docker service {create,update} --log-{driver,opt}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-20 09:18:59 +02:00
Steve Durrheimer
cdb8383d7f
Add zsh completion for 'docker node update --label-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-20 09:11:16 +02:00
Sebastiaan van Stijn
be2e2fca08 Merge pull request #24791 from albers/completion-node-update-labels
bash completion for `docker node update --label-{add,rm}`
2016-07-19 15:22:29 +02:00
Harald Albers
823e161de7 bash completion for docker service {create,update} --log-{driver,opt}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-19 13:20:40 +02:00
Harald Albers
bc6e3c0b5e bash completion for docker node update --label-{add,rm}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-19 13:09:28 +02:00
Arnaud Porterie
de64324109 Merge pull request #24705 from thaJeztah/update-flag-descriptions
Improve flag help consistency, and update docs
2016-07-18 16:07:23 +00:00
Sebastiaan van Stijn
ff1040bafc Merge pull request #24599 from vdemeester/small-zsh-completion-fix
Small zsh completion fix on --pretty & --no-resolve
2016-07-16 02:55:32 +02:00
Sebastiaan van Stijn
64a8317a5a 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>
2016-07-16 01:58:01 +02:00
Sebastiaan van Stijn
983fc99509 Merge pull request #24668 from sdurrheimer/zsh-completion-service-endpoint-mode
Update zsh completion for 'docker service {create,update} {--endpoint…
2016-07-15 14:40:45 +02:00
Steve Durrheimer
2e6922a6d3
Update zsh completion for 'docker service {create,update} {--endpoint-mode,--mode}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-15 14:36:18 +02:00
Sebastiaan van Stijn
a968f83c55 Merge pull request #24666 from sdurrheimer/zsh-completion-dockerd-oom-score-adjust
Add zsh completion for 'dockerd --oom-score-adjust'
2016-07-15 13:47:39 +02:00
Vincent Demeester
2a888c02a6 Merge pull request #24667 from sdurrheimer/zsh-completion-docker-service-create-update-registry-auth
Add zsh completion for 'docker service {create,update} --registry-auth'
2016-07-15 11:15:55 +02:00
Steve Durrheimer
64f08906a2
Add zsh completion for 'docker service {create,update} --registry-auth'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-15 08:23:57 +02:00
Steve Durrheimer
5d29732bdf
Add zsh completion for 'dockerd --oom-score-adjust'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-15 08:16:15 +02:00
Steve Durrheimer
ba5d9f63a3
Rename zsh completion for 'docker {create,run} --net --net-alias' to '--network --network-alias'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-15 08:09:20 +02:00
Sebastiaan van Stijn
7925de9098 Merge pull request #24598 from albers/completion-daemon--oom-score-adjust
bash completion for `docker daemon --oom-score-adjust`
2016-07-13 23:34:54 +02:00
Vincent Demeester
698bd5ab65
Small zsh completion fix on --pretty & --no-resolve
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 22:03:11 +02:00
Harald Albers
e1e310ea1f bash completion for docker daemon --oom-score-adjust
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 12:31:55 -07:00
Sebastiaan van Stijn
7bf0faf423
Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 18:47:29 +02:00
Arnaud Porterie
58624acf11 Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
Remove --command flag for service update
2016-07-13 16:01:11 +00:00
Vincent Demeester
e4a024d590
Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 16:19:21 +02:00
Harald Albers
c4846f6972 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>
2016-07-13 12:42:33 +02:00
Antonio Murdaca
ae1a809c39 Merge pull request #24581 from albers/completion-service--endpoint-mode
Update bash completion for `docker service {create,update} {--mode,--…
2016-07-13 09:52:52 +00:00
Harald Albers
a394490d38 Update bash completion for docker service {create,update} {--mode,--endpoint-mode}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 11:37:31 +02:00
Harald Albers
a44e71c427 bash completion for docker service {create,update} --registry-auth
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-13 11:20:02 +02:00
Brian Goff
2664f37452 Merge pull request #24119 from albers/completion-swarm-mode
Fix & improve bash completion for swarm mode commands
2016-07-08 15:34:51 -04:00
Vincent Demeester
a859a33647
Use "on-failure" for both containers and services
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-07 11:32:19 +02:00
Jonathan Lomas
7631dc80a6
Remove unmatched bracket from _docker for zsh
Signed-off-by: Jonathan Lomas <jonathan@floatinglomas.ca>
2016-07-06 08:57:28 -07:00
Steve Durrheimer
f5d768e2c5
Add zsh completion for 'docker service' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-04 15:14:58 +02:00
Antonio Murdaca
d97233ca88 Merge pull request #24276 from sdurrheimer/zsh-completion-daemon-add-runtime
Add zsh completion for 'docker daemon --runtimes' and 'docker run --r…
2016-07-04 14:40:56 +02:00
Steve Durrheimer
7ae3caa4e9
Add zsh completion for 'docker plugin' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 23:45:23 +02:00
Steve Durrheimer
2086663abd
Add zsh completion for 'docker swarm' commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 23:28:38 +02:00
Sebastiaan van Stijn
df3e3a227b Merge pull request #24272 from sdurrheimer/zsh-completion-node
Add zsh completion for 'docker node' commands
2016-07-03 13:58:14 -07:00
Steve Durrheimer
1dc9cf4901
Add zsh completion for 'docker ps --last'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-07-03 20:38:54 +02:00
Harald Albers
009d50e2d8 bash completion for default port on docker swarm {init,join}
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-03 10:48:37 -07:00
Harald Albers
715754ee61 bash completion can be configured to show node and service IDs
Signed-off-by: Harald Albers <github@albersweb.de>
2016-07-03 10:48:37 -07:00