Commit Graph

247 Commits

Author SHA1 Message Date
David Calavera 63ffbd873f Merge pull request #18055 from vincentbernat/fix/zsh-invalid-cache
zsh: ensure we have enough commands to store in the cache
Upstream-commit: 33d9ae358cbeb7093a61eff9b2fa7d842e1d96f1
Component: engine
2015-11-18 10:36:32 +01:00
Vincent Bernat 9ac360f32a zsh: remove lxc-related completion
LXC support has been deprecated and the related completion has been
removed in #17700 but was added back in #17334.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 8105a3a366bb22d1df843c828a16b6cae26e9531
Component: engine
2015-11-18 08:13:03 +01:00
Vincent Bernat f0c2b7dcae zsh: ensure we have enough commands to store in the cache
Otherwise, the cache would be invalid and won't be refreshed soon. This
can happen when the user has the completion installed before docker is
installed.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 61564bcb5f79754cf4e17a707731d9f78169c150
Component: engine
2015-11-18 08:08:43 +01:00
Alexander Morozov fe4028f4f6 Merge pull request #17334 from sdurrheimer/zsh-completion-log-options
Add zsh completion for log options
Upstream-commit: 346d195f6a8ed5217cb859ed1a6673eeb840e21d
Component: engine
2015-11-17 15:53:31 -08:00
Alexander Morozov cbf9321ca8 Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
Allow configurable metadata for Splunk log driver
Upstream-commit: a3065fa48f889ef438a7d7339ebc8fe01aca10dd
Component: engine
2015-11-16 10:11:27 -08:00
Harald Albers 02d6078f37 bash completion for docker {run,create} --volume-driver
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d411c47139e9a6d94c54bfb4052e7d12bf4295f0
Component: engine
2015-11-15 09:53:22 -08:00
Vincent Demeester c0d8796b26 Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00
Denis Gladkikh bba768bb09 Allow configurable metadata for Splunk log driver
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 26855c780184c528446957bd77821c6f4c74b343
Component: engine
2015-11-12 06:36:51 -08:00
Steve Durrheimer 64b4b99455 Add zsh completion for log options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 76fe00c859745bfc9c128b951ab7575fe370b7f2
Component: engine
2015-11-12 09:53:35 +01:00
Steve Durrheimer 860252559c Add zsh completion for 'docker {run,create} --volume-driver'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8446a5c88bd744df7f7468ec7eb8d8dee4e7c7e9
Component: engine
2015-11-12 08:35:32 +01:00
Sebastiaan van Stijn 5c10a00d00 Merge pull request #17807 from albers/completion-network-yes
Align configuration of bash completion with existing values
Upstream-commit: ee8aadbdd98c81d35e6072d4c1dc19cf1e79919e
Component: engine
2015-11-11 20:01:27 +00:00
Ma Shimiao 1a0735060a Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 0fbfa1449d917ee0778266139d6035fb0782f7c2
Component: engine
2015-11-11 23:06:36 +08:00
Sebastiaan van Stijn 5474215e49 Merge pull request #17806 from albers/fix-17768
Fix bash completion on systems where extglob is not set
Upstream-commit: d575d1e0944d5b245b7b21f46015346209f4a70e
Component: engine
2015-11-10 21:32:23 +00:00
Steve Durrheimer e9d65a16e5 Add zsh completion for 'docker stats --all -a'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ba2a5a420d6adf5ab7cd861d1c263dc8b74c7773
Component: engine
2015-11-10 08:47:46 +01:00
Harald Albers 77d68ba99d bash completion for docker stats --all
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ee13fc5b2f15ae5b4a8c1a6ee23355e6463e2b48
Component: engine
2015-11-09 16:27:13 +01:00
Harald Albers 63a8bacd69 Fix bash completion on systems where extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 211e3b0df67d17989c7aff63d1a0098ad61f07a3
Component: engine
2015-11-08 22:31:16 -08:00
Harald Albers 576351b40d Align configuration of bash completion with existing values
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8311db14fc2b71b5fd67f23527c3fd09a3addc85
Component: engine
2015-11-08 09:35:48 -08:00
Guilhem Lettron d04d1fe56b Fix missing -d flag in docker.fish
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
Upstream-commit: 4a3cd881721ff7986fcdc3544e67b66a259c2ca6
Component: engine
2015-11-06 11:53:17 +01:00
David Calavera f427a47755 Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
David Calavera ef88e7ace2 Remove LXC support.
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b5fac462d21ca164b3778647420016315289034
Component: engine
2015-11-05 17:09:57 -05:00
Steve Durrheimer 9c9f207191 Fix missing double quote in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e46445e844bca26775f88b3075d227f8e867a22a
Component: engine
2015-10-27 10:50:45 +01:00
Vincent Bernat 9d52fef685 zsh: allow option stacking for short options without arguments
This enables Zsh to understand commands like "docker run -it
ubuntu". However, by enabling this, this also makes Zsh completes
"docker run -u<tab>" with "docker run -uapprox" which is not valid. The
users have to put the space or the equal sign themselves before trying
to complete.

Therefore, this behavior is disabled by default. To enable it:

    zstyle ':completion:*:*:docker:*' option-stacking yes
    zstyle ':completion:*:*:docker-*:*' option-stacking yes

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 402caa94d23ea3ad47f814fc1414a93c5c8e7e58
Component: engine
2015-10-26 21:58:59 +01:00
Vincent Bernat fc2e9f4e02 zsh: allow short options to specify their arguments with "="
This is allowed by Docker and helps the completion to not get confused
when a user uses this notation. This will also help to enable stacking
of short options since Zsh needs that to not stack options with
arguments.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 8ac32d900a6d1cd20e9585d012b0be414507e727
Component: engine
2015-10-26 21:58:59 +01:00
Sebastiaan van Stijn 15bb74c0cb Merge pull request #17134 from sdurrheimer/zsh-completion-build-multi-tag
Add zsh completion for 'docker build' multi tags
Upstream-commit: 74b9d89648ffe55ca5b7f0d67cf28ff6bc404f36
Component: engine
2015-10-26 19:05:23 +01:00
Tibor Vass 80d5075264 Merge pull request #17333 from sdurrheimer/zsh-completion-fix-repeatable-options
Fix repeatable options in zsh completion
Upstream-commit: 7e275cf0e5e1edff77ce9b159e995e03f6ac3371
Component: engine
2015-10-26 12:43:21 -04:00
Steve Durrheimer f5dc31b651 Add zsh completion for 'docker build' multi tags
+ Fix some others multi options

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cc77fc3cb27c90568857c80d08787806d35aa5c8
Component: engine
2015-10-24 16:41:22 +02:00
Steve Durrheimer 02bb7042cb Fix repeatable options in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 796380761007a0d0087b41b1ee0d76fd6a7a6e20
Component: engine
2015-10-24 16:38:41 +02:00
Steve Durrheimer a34e3f32e2 Add splunk log driver to zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 230313b1c5cced44dd5ead776b2f62b55358222d
Component: engine
2015-10-24 13:49:27 +02:00
Denis Gladkikh 7a1aba432f Add Splunk logging driver #16207
Allow to send Splunk logs using Http Event Collector

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 1f1dbf312ddc299bdad408ce3d6b71f4f5993652
Component: engine
2015-10-23 13:37:53 -07:00
Vincent Demeester 4fb18756d8 Merge pull request #17306 from albers/completion-log-driver-options
bash completion for log driver options `env` and `labels`
Upstream-commit: a2e5bbe6409d1e639ed18ea2679b44da6bcd7332
Component: engine
2015-10-23 21:28:40 +02:00
Harald Albers 46ae794f08 bash completion for log driver options env and labels
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d0c019850c988735727723d04bfd82771fe650f8
Component: engine
2015-10-23 10:55:47 +02:00
Steve Durrheimer 8a2663e8ae Zsh completion for 'docker network inspect' multiple networks
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cb93fefa402c57986567a2a16afe0f49a3338b82
Component: engine
2015-10-23 08:13:33 +02:00
David Calavera 14cf75b797 Merge pull request #17270 from albers/completion-network-ids
bash completion can be configured to complete network IDs
Upstream-commit: 4816626f3e84ef6452ecfed9d79ae537273bde31
Component: engine
2015-10-22 13:37:38 -07:00
Harald Albers fa8ff6ad04 bash completion can be configured to complete network IDs
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1598500df8337a1fdde7954a7b0fc5688ae2acac
Component: engine
2015-10-22 18:58:34 +02:00
Harald Albers 5bc0dcf27f bash completion for docker network inspect supports multiple networks
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 10e485b3860516c23bc3efa43c62dd11ee912b3e
Component: engine
2015-10-22 17:53:17 +02:00
Tianon Gravi 3a9331408c Merge pull request #17153 from albers/completion-cp-args
[Fix 17029] docker cp completion not correct
Upstream-commit: 4786ac1ffe53c2229deb5fc14f1261fd33004afb
Component: engine
2015-10-21 14:58:11 -07:00
Tibor Vass d2c1aaefe0 Merge pull request #17149 from albers/completion-network-ipam
bash completion for new `docker network create` options
Upstream-commit: 3957368eff19170dd4d454b83cb593c8420b9d08
Component: engine
2015-10-20 15:54:05 -04:00
Tibor Vass 62ebe61ba1 Merge pull request #17150 from sdurrheimer/zsh-completion-network-driver-option
Add zsh completion for 'docker network create -o --opt'
Upstream-commit: 081edfed3253ab315e1c0d2b60ffb72dcdc3a725
Component: engine
2015-10-20 15:48:12 -04:00
Jess Frazelle 7958c67364 Merge pull request #17135 from albers/completion-restart-unless-stopped
Bash completion for restart policy `unless-stopped`
Upstream-commit: c766bcdc735fcedc9a95103082134e7744f23de3
Component: engine
2015-10-19 15:26:16 -07:00
Harald Albers 1ca6fb8dba bash completion for docker cp supports copying both ways
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c71c7f4b4f6fe95982c132c42c990e2d4085bb90
Component: engine
2015-10-18 08:24:02 -07:00
Steve Durrheimer 33c930fc65 Add zsh completion for 'docker network create -o --opt'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6447abfc35e80eb05d1f4ae16577378dcbff61e6
Component: engine
2015-10-18 15:09:59 +02:00
Harald Albers d13f5f0866 bash completion for new docker network create options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5013a2fbd68388a3a0843f26aba6d39c2d611a0a
Component: engine
2015-10-18 05:42:23 -07:00
Harald Albers 6bdcb86d86 bash completion: support for dm.use_deferred_* options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2d44ed6d64af79d167502edc2d8dab27b3224069
Component: engine
2015-10-18 04:42:17 -07:00
Harald Albers d8654fdfeb Bash completion for restart policy unless-stopped
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 504d2a921241c60c0078c946266e354ce12d1353
Component: engine
2015-10-17 07:24:17 -07:00
Vincent Demeester 943431b7fa Deprecate -c cli short variant flag in docker cli
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d1064bd441612244d7a560c6ceb3704ad12b23a6
Component: engine
2015-10-17 00:05:34 +02:00
Tibor Vass 8703001b4e Merge pull request #17106 from albers/completion-import
Add missing options to bash completion for `docker import`
Upstream-commit: e23d834a01e76cafbc473b317331df88e62c1807
Component: engine
2015-10-16 14:28:14 -07:00
Tibor Vass d7b2ac8e95 Merge pull request #17107 from albers/completion-build
Add missing options to bash completion for `docker build`
Upstream-commit: b1bab9e1e70dd05b3a5a7296d7cd8c426bb52488
Component: engine
2015-10-16 14:27:51 -07:00
Steve Durrheimer 7b324dba2d Zsh completion : all --<option>= flag values may be given in the next argument
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b34aa69e8f11ad03b2dffc5ed77ca93a9f32674c
Component: engine
2015-10-16 21:18:27 +02:00
Sebastiaan van Stijn 40fe606d4e Merge pull request #17098 from sdurrheimer/zsh-completion-import-message
Add zsh completion for 'docker import -m --message'
Upstream-commit: ccf5b60c6f291da16d3857ac9bfddb1d8407e7be
Component: engine
2015-10-16 11:36:46 -07:00
Brian Goff 6d17273149 Merge pull request #17101 from sdurrheimer/zsh-completion-deprecate-run-dash-c-option
Deprecate 'docker run -c' option in zsh completion
Upstream-commit: 08a43b8b3b68273fcc84cd7f04419a103dcad76a
Component: engine
2015-10-16 11:40:02 -04:00