Commit Graph

203 Commits

Author SHA1 Message Date
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
Brian Goff e3c27b1293 Merge pull request #17099 from sdurrheimer/zsh-completion-restart-unless-stopped
Add zsh completion for 'unless-stopped' restart policy
Upstream-commit: 30b945fac958ccf1f9bbed45c2433c1ebcdf6f08
Component: engine
2015-10-16 11:37:27 -04:00
Harald Albers 97ebdafc04 Add missing options to bash completion for docker import
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b0315375f887600cc98c63b434e8d2401fc3d1d8
Component: engine
2015-10-16 12:42:12 +02:00
Harald Albers bb7266ff8d bash completion: minor refactoring for consistency
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3a713d91ce7d9edfe301e367f097d8cf370d2c52
Component: engine
2015-10-16 12:41:09 +02:00
Harald Albers c9f49c5202 Add missing options to bash completion for docker build
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 28c66b04911e98617be65bd4dce9cb9b9e134e4c
Component: engine
2015-10-16 12:40:55 +02:00
Steve Durrheimer 551d7de4db Add zsh completion for 'docker import -m --message'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 96a09ea77cc4d8f80be4bd3e382688223e8c5c7e
Component: engine
2015-10-16 10:14:42 +02:00
Steve Durrheimer ef552b72f9 Add zsh completion for 'docker build --build-arg'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 89e0990224f520f8772da4872dd277bae2c1287f
Component: engine
2015-10-16 08:48:12 +02:00
Steve Durrheimer 9a4b26a580 Deprecate 'docker run -c' option in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c37c9df18a2fc3c34be3d8d21dae16553c8d4633
Component: engine
2015-10-16 08:37:16 +02:00
Steve Durrheimer 5f8debf9b3 Add zsh completion for 'unless-stopped' restart policy
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cb2bd8bcec38a597208209f0fb52593f3b6844a4
Component: engine
2015-10-16 08:30:56 +02:00
Jess Frazelle 24ba438ab4 Merge pull request #17082 from sdurrheimer/zsh-completion-remove-network-ls-old-options
Remove 'docker network ls -n -l --latest' options from in zsh completion
Upstream-commit: ebfed4d474489bfa8b0d16f6628c1e28388d8ea3
Component: engine
2015-10-15 13:48:39 -07:00
Steve Durrheimer de9c63d909 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: a00c0d795dcba112262d3dd297247259f9b50488
Component: engine
2015-10-15 21:40:50 +02:00
Steve Durrheimer d24169e5d2 Remove '-n -l --latest' options from 'docker network ls' in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 080a906aac1760922a2791e86dc10190600c9f7c
Component: engine
2015-10-15 21:12:31 +02:00
Madhu Venugopal 7b66bab8fb 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: 46f7ab35854151ac054bf04f2bb7b344374b6d02
Component: engine
2015-10-15 03:10:39 -07:00
Harald Albers cce0231be7 Add bash completion for docker inspect --size
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 29714ee836fa263143986de8dc04bbf821277eab
Component: engine
2015-10-14 17:34:56 +02:00
Vincent Demeester 019ffb819f Merge pull request #15796 from azurezk/add-size-to-inspect
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
2015-10-13 23:16:10 +02:00
Jess Frazelle 6ed533b627 Merge pull request #16922 from albers/completion-network
[Fix #16919] Add bash completion for `docker network`
Upstream-commit: 3fc75c97399676ae2ac6e667a517ecee640d9138
Component: engine
2015-10-13 11:25:54 -07:00
Vincent Demeester ae4ea17577 Merge pull request #16904 from vikstrous/fish_completion_bug
fix fish completion wrong image names bug
Upstream-commit: 151564d39b5df4d428a4709e20b0e9eaac89f6ad
Component: engine
2015-10-12 20:42:24 +02:00
Steve Durrheimer 2ede0b7338 Add zsh completion for 'docker network'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 24174e8a84082ca8ac337858db311a6f39699f3e
Component: engine
2015-10-12 12:06:12 +02:00
Harald Albers 1018cbd343 Bash completion for docker network
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 68de2d48341fa7c2acd441429bb30fc50f875e24
Component: engine
2015-10-11 11:07:48 -07:00
Harald Albers 51395cbbce 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: e4bf5cff49a152794b924d9cf4d6cee605f2d73a
Component: engine
2015-10-11 11:07:33 -07:00
Steve Durrheimer e49a07f95b Add zsh completion for '--cluster-store-opt'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ae31aa10abae62f95443ca610b0bae2662973776
Component: engine
2015-10-10 16:42:01 +02:00
Zhang Kun 9375e8c909 add size to inspect
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: b4d6b23838bb7d8436a1966fc3ef3ade83544d58
Component: engine
2015-10-10 20:44:29 +08:00
Viktor Stanchev c06269ae99 fix fish completion; wrong image names bug; close #16672
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
Upstream-commit: 4d746658cced59cdbcc2e045d8ed931f782ef1dd
Component: engine
2015-10-10 00:55:09 -07:00
Harald Albers 109ae801cf Add bash completion for --cluster-store-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a095f82877cd3ab7e49526715259a86b47c996f4
Component: engine
2015-10-09 14:00:52 +02:00
Jessica Frazelle 3ba7e5f650 change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c559d8ebf7df5f7b7cb912c34e2f9056fa1b32e5
Component: engine
2015-10-07 10:16:37 -07:00
Steve Durrheimer 29630cd41d Add zsh completion for 'docker daemon --no-legacy-registry'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 883fe220ec0016922cf769f6ff8b7f85d9994d82
Component: engine
2015-10-05 08:31:00 +02:00
Sebastiaan van Stijn 72f4bc7137 Merge pull request #16744 from runcom/fix-mam-commandline
Fix man and commandline docs
Upstream-commit: 67eb810a604905df0a33ce20085c8aeddfb0171a
Component: engine
2015-10-04 22:28:19 +02:00
Antonio Murdaca b51b5af287 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: 14e8898648909379f37049828e103ba1c97f253b
Component: engine
2015-10-04 21:22:27 +02:00
Harald Albers e3177a2c43 Add bash completion for --no-legacy-registry
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3f04ab2fc773a89f2ff465d995d10793a67f23a2
Component: engine
2015-10-04 06:49:42 -07:00
Vincent Demeester 906e8ce80c Merge pull request #16629 from sdurrheimer/cluster-options-zsh-completion
Add zsh completion for --cluster-store and --cluster-advertise
Upstream-commit: 825f1a7e286699d3f4bc03e657fd37f8a7a68aed
Component: engine
2015-09-30 20:48:25 +01:00
Steve Durrheimer e7ae7ea3cd Add zsh completion for --cluster-store and --cluster-advertise options for docker daemon
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c576310b6f11c22c1372d1aa214d4c2efdbc7d7f
Component: engine
2015-09-28 15:13:42 +02:00
Harald Albers ca41ef5d58 bash completion for docker daemon --cluster-*
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1c71c1995fd9989c3d3c6a06e0dfdfe39c32a206
Component: engine
2015-09-28 11:23:23 +02:00
Jess Frazelle 58c0f4ebe8 Merge pull request #14579 from hqhq/hq_add_softlimit
Add support for memory reservation
Upstream-commit: 84b53c8d87c0ab887209a51e54fad60a591e737a
Component: engine
2015-09-24 12:11:36 -07:00
Jess Frazelle 24584ca8a3 Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cp
Docs: correct the description of docker cp
Upstream-commit: a077c46d140ade9b78d81c66fe4b752e6ea25f13
Component: engine
2015-09-23 15:40:58 -07:00
Tibor Vass 72d0228543 Merge pull request #15915 from sdurrheimer/master
Zsh completion updates
Upstream-commit: 8d69e0eae06a741c8887af12d09461e89b950515
Component: engine
2015-09-23 17:20:34 -04:00
qhuang 4f3fe3187a Add support for memory reservation
Signed-off-by: qhuang <qhuang@10.0.2.15>
Upstream-commit: aa1780997f42a3fbe3a7f9c7be2b8a5092b9b7c1
Component: engine
2015-09-23 14:02:45 +08:00
Harald Albers 7e4c20cd08 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: 9d8f9943e99b87aa637921bbf582a767cbab6cf1
Component: engine
2015-09-22 12:17:30 -07:00
David Calavera dbbb1621a8 Merge pull request #16400 from albers/completion-log-opt-tags
bash completion: use generic `tag` log driver option
Upstream-commit: 108891069f60a535ca6397b388145bd188dc8263
Component: engine
2015-09-21 17:17:11 -07:00
Sally O'Malley 4168ba7ed4 docker restarts running OR stopped containers, docs edit rm "running"
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: e41753678d5ffd6c505f1984943bc36d34e134bb
Component: engine
2015-09-20 09:16:27 -04:00
Lei Jitang 3f59f642d4 Docs: correct the description of docker cp
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: ee6b81faf2a6d49a53cc79571f5c96be4bdb8db0
Component: engine
2015-09-20 18:02:28 +08:00
Steve Durrheimer 8bfc2a9fcb 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: 07f1d68887d78c19712e239c4b402873951cef90
Component: engine
2015-09-19 12:03:55 +02:00
Harald Albers d6e26866b7 bash completion: use generic tag log driver option
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5d6ca225d12ff1746df32e45b4048ecb680ca405
Component: engine
2015-09-18 16:20:05 +02:00
Tim Hockin 655513db24 Add support for DNS options
Signed-off-by: Tim Hockin <thockin@google.com>
Upstream-commit: 3d4685e258a7729bd0f8cc411b5a73980a9faa20
Component: engine
2015-09-16 14:06:45 -07:00
Harald Albers 27422ef1df Fix bash completion when extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0a5aac1ff6cbacfeefb34702b4726a4e189b1bb9
Component: engine
2015-09-16 18:17:40 +02:00
David Calavera d563cc164c Signal to stop a container.
Allow to set the signal to stop a container in `docker run`:
- Use `--stop-signal` with docker-run to set the default signal the container will use to exit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0e50d946a25beb134bce2aaf4a209b5cfcbacf8f
Component: engine
2015-09-10 19:56:05 -04:00