Commit Graph

137 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
56082f8faa Add awslogs driver for Amazon CloudWatch Logs
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 3effe484e6f572298d0c3490517f57391617aa51
Component: engine
2015-09-09 13:52:40 -07:00
2de855c127 bash completion for docker volume
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 57ab4a1a6c0d2305ec273eb5ccdbf816144f839e
Component: engine
2015-09-07 13:22:57 -07:00
7dbe195606 Add docker ps --filter=… image completion
I missed that on #15919, thanks @albers

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6ae2cb7ad1aea951d50094638f386f78de57080c
Component: engine
2015-09-01 08:47:02 +02:00
33e7393fb4 Update shell completion on docker ps for ancestor
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 672bae2dc0af6bce3ffc7a1144a22fb740a8e013
Component: engine
2015-08-28 20:56:52 +02:00
9f8e87311a Merge pull request #15332 from pugnascotia/master
Make run and rmi bash completions configurable
Upstream-commit: cb00396f61d0960af712094bac8711ca309b1aec
Component: engine
2015-08-24 10:49:01 +02:00
3004521c7f Add support for kernel memory limit
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b6f1b4ad350cbf1f540797eee44520694237d47c
Component: engine
2015-08-19 23:56:55 +08:00
84b06479b0 Fix bash completion for log driver options
This option was incorrectly ported to the new `daemon` subcommand
structure.

Beside the obvious effect that completion of `docker daemon --log-opt`
did not work, this also caused completion of `docker` and `docker xxx`
to fail on macs with

> bash: words: bad array subscript

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 18381faee685c6d28dd7438a183bf7a441e8c9a1
Component: engine
2015-08-18 09:17:29 +02:00
f2f5327a6e Merge pull request #14113 from dit4c/10348-exec-privileged
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
2015-08-16 00:20:41 +02:00
ac8160b56d Merge pull request #15525 from albers/completion-option-updates
Updates to bash completion for docker run and docker daemon.
Upstream-commit: 313b37129a585f064d32ebf0c4e1a938a0d1fa2c
Component: engine
2015-08-14 13:55:11 -07:00
a769102a1e Make run and rmi bash completions configurable
Allow the user to configure how Docker's bash completion works for the
"events", "history", "inspect", "run", "rmi" and "save" commands through the
following environment variables:

DOCKER_COMPLETION_SHOW_IMAGE_IDS
  "none" - Show names only (default)
  "non-intermediate" - Show names and ids, but omit intermediate image IDs
  "all" - Show names and ids, including intermediate image IDs

DOCKER_COMPLETION_SHOW_TAGS
  "yes" - include tags in completion options (default)
  "no"  - don't include tags in completion options

Fixes #9474.

Signed-off-by: Rory Hunter <roryhunter2@gmail.com>
Upstream-commit: 60d97a4a63bc32d55d40b62e08e21260f4416a5f
Component: engine
2015-08-14 11:29:29 +01:00
337be087f4 Revert "Revert "Add docker exec run a command in privileged mode""
This reverts commit 40b71adee390e9c06471b89ed845132b4ec80177.

Original commit (for which this is effectively a rebased version) is
72a500e9e5929b038816d8bd18d462a19e571c99 and was provided by Lei Jitang
<leijitang@huawei.com>.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 03f65b3d0d66ccdc8b69a447b75508d594007600
Component: engine
2015-08-13 16:36:44 +10:00
534bcd14d8 Merge pull request #15449 from albers/completion-help
Remove -h flag from completion and daemon reference
Upstream-commit: d50881e446c4f230099e41124fda481849e82222
Component: engine
2015-08-12 17:09:51 -07:00
4371aaaac5 Add storage options to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e4d8a8e1cac0ea473da315e86969dc810670b64e
Component: engine
2015-08-12 06:13:24 -07:00
a0599049a0 Add options for the json-file logging driver to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5c1ad6f90cfc2aaf5d3fe416ca43e96774d608c5
Component: engine
2015-08-12 04:39:29 -07:00
68fb5ac1b9 Update bash completion for docker run
Also fixed sort order of options using `sort -d`

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 644c158837b043113a689cab765997feb2e507a7
Component: engine
2015-08-12 04:38:55 -07:00
f68b6c3486 Remove -h flag from completion and daemon reference
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.

`-h` is not included in the help messages of the commands, though.

It ist visible in
* reference: only in `docker daemon` reference,
  see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
  see output of `grep -RF '**-h**' man`

For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ceb11d966034f4b4308abf4fc2826b4c840b6e99
Component: engine
2015-08-11 07:30:58 -07:00