Commit Graph
177 Commits
Author SHA1 Message Date
Steve Durrheimer 2de3c9f772 Fix missing double quote in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7f6859ce5a
Component: cli
2017-06-02 00:07:15 +00:00
Vincent Bernat bc09bd9da3 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: b10fb43048
Component: cli
2017-06-02 00:07:15 +00:00
Vincent Bernat 052dd3f6a8 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: 2102746489
Component: cli
2017-06-02 00:07:15 +00:00
Steve Durrheimer 8c65a8b8f6 Add zsh completion for 'docker build' multi tags
+ Fix some others multi options

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 060e6e1935
Component: cli
2017-06-02 00:07:14 +00:00
Steve Durrheimer 644e4c5a10 Fix repeatable options in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 4332d3b5d8
Component: cli
2017-06-02 00:07:14 +00:00
Steve Durrheimer 474ccf50b2 Add splunk log driver to zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 526c844004
Component: cli
2017-06-02 00:07:14 +00:00
Denis Gladkikh 3be895e8da Add Splunk logging driver #16207
Allow to send Splunk logs using Http Event Collector

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 1e2a27568b
Component: cli
2017-06-02 00:07:14 +00:00
Harald Albers 3e5032bf12 bash completion for log driver options env and labels
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a41d4dbdde
Component: cli
2017-06-02 00:07:14 +00:00
Steve Durrheimer a897c3f32c Zsh completion for 'docker network inspect' multiple networks
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f06b7a7713
Component: cli
2017-06-02 00:07:14 +00:00
Harald Albers b10cc3ac63 bash completion can be configured to complete network IDs
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: be7caf2647
Component: cli
2017-06-02 00:07:14 +00:00
Harald Albers a2346eda68 bash completion for docker network inspect supports multiple networks
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b20b7584de
Component: cli
2017-06-02 00:07:14 +00:00
Harald Albers ef216a0fb8 bash completion for docker cp supports copying both ways
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6b43a0aa73
Component: cli
2017-06-02 00:07:14 +00:00
Harald Albers cbff938ed8 bash completion for new docker network create options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a2bbb2c61c
Component: cli
2017-06-02 00:07:14 +00:00
Steve Durrheimer 00a2827cb7 Add zsh completion for 'docker network create -o --opt'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 4e6212f389
Component: cli
2017-06-02 00:07:14 +00:00
Harald Albers a5c27ff0c7 Bash completion for restart policy unless-stopped
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 28f2bdf335
Component: cli
2017-06-02 00:07:13 +00:00
Harald Albers a8b3e2deea bash completion: support for dm.use_deferred_* options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 321a5b38e7
Component: cli
2017-06-02 00:07:13 +00:00
Vincent Demeester 80cce1f5ce Deprecate -c cli short variant flag in docker cli
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4c506e1df7
Component: cli
2017-06-02 00:07:13 +00:00
Harald Albers a9f41b5a62 Add missing options to bash completion for docker import
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c3c2867b15
Component: cli
2017-06-02 00:07:13 +00:00
Harald Albers cc1819978a bash completion: minor refactoring for consistency
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9d4969150a
Component: cli
2017-06-02 00:07:13 +00:00
Harald Albers d40cef7233 Add missing options to bash completion for docker build
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0ef21aeab2
Component: cli
2017-06-02 00:07:13 +00:00
Steve Durrheimer dd502cefea Zsh completion : all --<option>= flag values may be given in the next argument
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 88664b18b9
Component: cli
2017-06-02 00:07:13 +00:00
Steve Durrheimer 0372f2a433 Add zsh completion for 'docker import -m --message'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1040139182
Component: cli
2017-06-02 00:07:13 +00:00
Steve Durrheimer fe064e150d Deprecate 'docker run -c' option in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 570a5f17bf
Component: cli
2017-06-02 00:07:13 +00:00
Steve Durrheimer 622facd72b Add zsh completion for 'unless-stopped' restart policy
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: dbf572a81d
Component: cli
2017-06-02 00:07:13 +00:00
Steve Durrheimer 014a8fa50f Add zsh completion for 'docker build --build-arg'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 96af7e18b9
Component: cli
2017-06-02 00:07:13 +00:00
Steve Durrheimer 52c421ec6b Remove '-n -l --latest' options from 'docker network ls' in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b6b1fc6a34
Component: cli
2017-06-02 00:07:13 +00:00
Steve Durrheimer ef15f35c65 Add zsh completion for '--ipam-driver --subnet --ip-range --gateway --aux-address' for 'docker network create'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d6ac5c6556
Component: cli
2017-06-02 00:07:13 +00:00
Madhu Venugopal de10af7bd7 Added network to docker --help and help cleanup
Fixes https://github.com/docker/docker/issues/16909

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 3a779b2995
Component: cli
2017-06-02 00:07:13 +00:00
Harald Albers e44fcd2712 Add bash completion for docker inspect --size
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3a89624209
Component: cli
2017-06-02 00:07:12 +00:00
Zhang Kun 9a66bfc2e3 add size to inspect
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: de3e44577a
Component: cli
2017-06-02 00:07:12 +00:00
Harald Albers 98088a6131 Bash completion for docker network
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 966ebe7b62
Component: cli
2017-06-02 00:07:12 +00:00
Harald Albers 7dc7d29f7b Refactor bash completion: pull out subcommand parsing
`docker network` is the second command with subcommands.

This refactoring pulls out parsing and processing of subcommands
from `docker volume` completion and thus makes its logic available
for other commands.

Also enables `__docker_pos_first_nonflag` for subcommand completion.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 26294f39f2
Component: cli
2017-06-02 00:07:12 +00:00
Viktor Stanchev 38cbcb9edf fix fish completion; wrong image names bug; close #16672
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
Upstream-commit: dd91c424fa
Component: cli
2017-06-02 00:07:12 +00:00
Steve Durrheimer 5ccdc08796 Add zsh completion for 'docker network'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cbc9cbde21
Component: cli
2017-06-02 00:07:12 +00:00
Steve Durrheimer a227b1db85 Add zsh completion for '--cluster-store-opt'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 64c577bdd8
Component: cli
2017-06-02 00:07:12 +00:00
Harald Albers 5196a71aac Add bash completion for --cluster-store-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4fcea52287
Component: cli
2017-06-02 00:07:12 +00:00
Jessica Frazelle 40051ff694 change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0afb6cc862
Component: cli
2017-06-02 00:07:11 +00:00
Steve Durrheimer 41270896e7 Add zsh completion for 'docker daemon --no-legacy-registry'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 53089d74fe
Component: cli
2017-06-02 00:07:11 +00:00
Antonio Murdaca ba5c93f531 Fix man and commandline docs
- missing help option in `docs/reference/commandline/*.md` (some files
  have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: cbd33a2b27
Component: cli
2017-06-02 00:07:11 +00:00
Harald Albers 530fe2b9f7 Add bash completion for --no-legacy-registry
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1b1a0a0835
Component: cli
2017-06-02 00:07:10 +00:00
Steve Durrheimer 3e4a3f9b84 Add zsh completion for --cluster-store and --cluster-advertise options for docker daemon
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 88ef8f31aa
Component: cli
2017-06-02 00:07:10 +00:00
Harald Albers c6d4699aa4 bash completion for docker daemon --cluster-*
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3fce5e1084
Component: cli
2017-06-02 00:07:10 +00:00
qhuang c7f7b0b0c5 Add support for memory reservation
Signed-off-by: qhuang <qhuang@10.0.2.15>
Upstream-commit: d5b1d055b8
Component: cli
2017-06-02 00:07:10 +00:00
Lei Jitang e4e2ea0cbd Docs: correct the description of docker cp
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 9ec9856889
Component: cli
2017-06-02 00:07:10 +00:00
Steve Durrheimer f67f9bd91a Catchup missing changes for the zsh completion
- felixr/docker-zsh-completion@6ae6279: Add --privileged flag to docker exec command in zsh completion
 - felixr/docker-zsh-completion@259ea00: Remove -h help flag from subcommands in zsh completion
 - felixr/docker-zsh-completion@5f77b29: Add docker ps --format flag to zsh completion
 - felixr/docker-zsh-completion@a1f39f8: Add --config flag to zsh completion
 - felixr/docker-zsh-completion@6a503b4: Filter zsh completions of inspect command by --type
 - felixr/docker-zsh-completion@d286ccd: Add --ulimit flag to build command to zsh completion
 - felixr/docker-zsh-completion@bdc1261: Add support for kernel memory limit in zsh completion
 - felixr/docker-zsh-completion@c8ce164: Add docker volume command and subcommands in zsh completion
 - felixr/docker-zsh-completion@7f996bf: Add docker daemon command to zsh completion
 - felixr/docker-zsh-completion@4ccd292: Be more generic when parsing "docker ps" output.
 - felixr/docker-zsh-completion@cd0f1b9: Fix container completion by name
 - felixr/docker-zsh-completion@8bf9041: Use "docker ps --no-trunc" to build completion.
 - felixr/docker-zsh-completion@b721bbb: Only keep the last name for a running/stopped container
 - felixr/docker-zsh-completion@6791b3e: Fix "docker run --stop-signal" completion
 - felixr/docker-zsh-completion@961f628: Try some heuristics to determine the canonical container name

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 65c5e2b950
Component: cli
2017-06-02 00:07:10 +00:00
Harald Albers 5c93fb306b Bash completion: avoid 'compopt: command not found' errors on Mac OS
The shell builtin `compopt` is not available on the outdated bash
version 3.2.57 that ships with Mac OS.
It is used in Docker's bash completion to suppress trailing spaces
in advanced completions of hash map options, e.g. `--log-opt`.

If `compopt` is not available, the new behavior is to do nothing,
i.e. the user will have to delete the additional space.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7310f4a2bd
Component: cli
2017-06-02 00:07:10 +00:00
Harald Albers e0b0bc40ce bash completion: use generic tag log driver option
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: eb684d2bad
Component: cli
2017-06-02 00:07:09 +00:00
Sally O'Malley 85e27f63c7 docker restarts running OR stopped containers, docs edit rm "running"
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: fac1158156
Component: cli
2017-06-02 00:07:09 +00:00
Tim Hockin 8a794fe86d Add support for DNS options
Signed-off-by: Tim Hockin <thockin@google.com>
Upstream-commit: 8bdf17d8fe
Component: cli
2017-06-02 00:07:09 +00:00
Harald Albers e19ee5c257 Fix bash completion when extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f5eb62c180
Component: cli
2017-06-02 00:07:09 +00:00