Commit Graph

209 Commits

Author SHA1 Message Date
Harald Albers 2033c09705 Use computed plugin lists in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-21 18:30:23 +01:00
Vincent Demeester 34a3c3cacf Add --format support to images command
- rename `api/client/ps` to `api/client/formatter`
- add a a image formatter

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-12-21 17:38:07 +01:00
Ma Shimiao 843084b08b Add support for blkio read/write iops device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-21 09:14:49 +08:00
Harald Albers 069fe81fa6 bash completion for `docker daemon --authz-plugin`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-14 13:25:45 -08:00
Harald Albers d7c9ae60e6 Improve bash completion for `docker network disconnect`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-07 09:55:00 +01:00
Jess Frazelle 87a614ed55 Merge pull request #17989 from jfrazelle/initial-seccomp-support
Phase 1: Initial seccomp support
2015-12-05 08:33:58 -08:00
Ma Shimiao 3f15a055e5 Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-04 09:26:03 +08:00
Jessica Frazelle ae76f7e23e
update bash completion for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:49 -08:00
Phil Estes 4d849619d4 Merge pull request #17481 from vdemeester/17446-network-inspect-format
Add format flag to network inspect
2015-12-03 16:16:04 -05:00
Vincent Demeester 295c27388d Add format flag to network inspect
…for consistency as docker inspect and docker volume inspect supports it too

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-12-02 22:32:10 +01:00
Arnaud Porterie 8f1f53f735 Merge pull request #16277 from runcom/add-oom-score-adj
Add OomScoreAdj
2015-12-02 11:49:51 -08:00
Dan Walsh b3e527dfd2 This patch adds --tmpfs as a option for mounting tmpfs on directories
It will Tar up contents of child directory onto tmpfs if mounted over

This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-12-02 10:06:59 -05:00
Antonio Murdaca d3af7f283d Add OomScoreAdj to configure container oom killer preferences
libcontainer v0.0.4 introduces setting `/proc/self/oom_score_adj` to
better tune oom killing preferences for container process. This patch
simply integrates OomScoreAdj libcontainer's config option and adjust
the cli with this new option.

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-30 11:19:04 +01:00
Alexander Morozov a3065fa48f Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
Allow configurable metadata for Splunk log driver
2015-11-16 10:11:27 -08:00
Harald Albers d411c47139 bash completion for `docker {run,create} --volume-driver`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-15 09:53:22 -08:00
Vincent Demeester 812a1c149a Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
Add support for blkio.weight_device
2015-11-12 20:42:13 +01:00
Denis Gladkikh 26855c7801 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>
2015-11-12 06:36:51 -08:00
Sebastiaan van Stijn ee8aadbdd9 Merge pull request #17807 from albers/completion-network-yes
Align configuration of bash completion with existing values
2015-11-11 20:01:27 +00:00
Ma Shimiao 0fbfa1449d Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-11-11 23:06:36 +08:00
Sebastiaan van Stijn d575d1e094 Merge pull request #17806 from albers/fix-17768
Fix bash completion on systems where extglob is not set
2015-11-10 21:32:23 +00:00
Harald Albers ee13fc5b2f bash completion for `docker stats --all`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-09 16:27:13 +01:00
Harald Albers 211e3b0df6 Fix bash completion on systems where extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-08 22:31:16 -08:00
Harald Albers 8311db14fc Align configuration of bash completion with existing values
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-08 09:35:48 -08:00
David Calavera 157b66ad39 Remove exec-driver global daemon option.
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:58 -05:00
David Calavera 3b5fac462d 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>
2015-11-05 17:09:57 -05:00
Denis Gladkikh 1f1dbf312d Add Splunk logging driver #16207
Allow to send Splunk logs using Http Event Collector

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
2015-10-23 13:37:53 -07:00
Harald Albers d0c019850c bash completion for log driver options `env` and `labels`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-23 10:55:47 +02:00
David Calavera 4816626f3e Merge pull request #17270 from albers/completion-network-ids
bash completion can be configured to complete network IDs
2015-10-22 13:37:38 -07:00
Harald Albers 1598500df8 bash completion can be configured to complete network IDs
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-22 18:58:34 +02:00
Harald Albers 10e485b386 bash completion for `docker network inspect` supports multiple networks
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-22 17:53:17 +02:00
Tianon Gravi 4786ac1ffe Merge pull request #17153 from albers/completion-cp-args
[Fix 17029] docker cp completion not correct
2015-10-21 14:58:11 -07:00
Tibor Vass 3957368eff Merge pull request #17149 from albers/completion-network-ipam
bash completion for new `docker network create` options
2015-10-20 15:54:05 -04:00
Jess Frazelle c766bcdc73 Merge pull request #17135 from albers/completion-restart-unless-stopped
Bash completion for restart policy `unless-stopped`
2015-10-19 15:26:16 -07:00
Harald Albers c71c7f4b4f bash completion for `docker cp` supports copying both ways
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-18 08:24:02 -07:00
Harald Albers 5013a2fbd6 bash completion for new `docker network create` options
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-18 05:42:23 -07:00
Harald Albers 2d44ed6d64 bash completion: support for dm.use_deferred_* options
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-18 04:42:17 -07:00
Harald Albers 504d2a9212 Bash completion for restart policy `unless-stopped`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-17 07:24:17 -07:00
Vincent Demeester d1064bd441 Deprecate -c cli short variant flag in docker cli
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-17 00:05:34 +02:00
Tibor Vass e23d834a01 Merge pull request #17106 from albers/completion-import
Add missing options to bash completion for `docker import`
2015-10-16 14:28:14 -07:00
Harald Albers b0315375f8 Add missing options to bash completion for `docker import`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-16 12:42:12 +02:00
Harald Albers 3a713d91ce bash completion: minor refactoring for consistency
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-16 12:41:09 +02:00
Harald Albers 28c66b0491 Add missing options to bash completion for `docker build`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-16 12:40:55 +02:00
Madhu Venugopal 46f7ab3585 Added `network` to docker --help and help cleanup
Fixes https://github.com/docker/docker/issues/16909

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-15 03:10:39 -07:00
Harald Albers 29714ee836 Add bash completion for `docker inspect --size`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-14 17:34:56 +02:00
Harald Albers 68de2d4834 Bash completion for `docker network`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-11 11:07:48 -07:00
Harald Albers e4bf5cff49 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>
2015-10-11 11:07:33 -07:00
Harald Albers a095f82877 Add bash completion for `--cluster-store-opt`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-09 14:00:52 +02:00
Jessica Frazelle c559d8ebf7
change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-07 10:16:37 -07:00
Harald Albers 3f04ab2fc7 Add bash completion for `--no-legacy-registry`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-04 06:49:42 -07:00
Harald Albers 1c71c1995f bash completion for `docker daemon --cluster-*`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-28 11:23:23 +02:00
qhuang aa1780997f Add support for memory reservation
Signed-off-by: qhuang <qhuang@10.0.2.15>
2015-09-23 14:02:45 +08:00
Harald Albers 9d8f9943e9 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>
2015-09-22 12:17:30 -07:00
Harald Albers 5d6ca225d1 bash completion: use generic `tag` log driver option
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-18 16:20:05 +02:00
Tim Hockin 3d4685e258 Add support for DNS options
Signed-off-by: Tim Hockin <thockin@google.com>
2015-09-16 14:06:45 -07:00
Harald Albers 0a5aac1ff6 Fix bash completion when extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-16 18:17:40 +02:00
David Calavera 0e50d946a2 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>
2015-09-10 19:56:05 -04:00
Samuel Karp 3effe484e6 Add awslogs driver for Amazon CloudWatch Logs
Signed-off-by: Samuel Karp <skarp@amazon.com>
2015-09-09 13:52:40 -07:00
Harald Albers 57ab4a1a6c bash completion for `docker volume`
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-07 13:22:57 -07:00
Vincent Demeester 6ae2cb7ad1 Add docker ps --filter=… image completion
I missed that on #15919, thanks @albers

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-01 08:47:02 +02:00
Vincent Demeester 672bae2dc0 Update shell completion on docker ps for ancestor
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-28 20:56:52 +02:00
David Calavera cb00396f61 Merge pull request #15332 from pugnascotia/master
Make run and rmi bash completions configurable
2015-08-24 10:49:01 +02:00
Qiang Huang b6f1b4ad35 Add support for kernel memory limit
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-19 23:56:55 +08:00
Harald Albers 18381faee6 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>
2015-08-18 09:17:29 +02:00
Sebastiaan van Stijn e1f3a5ad0a Merge pull request #14113 from dit4c/10348-exec-privileged
Remerge of `docker exec --privileged` with better tests
2015-08-16 00:20:41 +02:00
David Calavera 313b37129a Merge pull request #15525 from albers/completion-option-updates
Updates to bash completion for docker run and docker daemon.
2015-08-14 13:55:11 -07:00
Rory Hunter 60d97a4a63 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>
2015-08-14 11:29:29 +01:00
Tim Dettrick 03f65b3d0d Revert "Revert "Add docker exec run a command in privileged mode""
This reverts commit 40b71adee3.

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

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
2015-08-13 16:36:44 +10:00
David Calavera d50881e446 Merge pull request #15449 from albers/completion-help
Remove -h flag from completion and daemon reference
2015-08-12 17:09:51 -07:00
Harald Albers e4d8a8e1ca Add storage options to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-12 06:13:24 -07:00
Harald Albers 5c1ad6f90c Add options for the json-file logging driver to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-12 04:39:29 -07:00
Harald Albers 644c158837 Update bash completion for `docker run`
Also fixed sort order of options using `sort -d`

Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-12 04:38:55 -07:00
Harald Albers ceb11d9660 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>
2015-08-11 07:30:58 -07:00
Harald Albers 5cee7e8116 Add missing storage drivers to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-10 08:49:40 -07:00
Harald Albers c465ba7bde Add `docker ps --format` to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-10 06:51:14 -07:00
Harald Albers b898111d3a Add `--config` to bash completion
The custom configuration will also be used in docker invocations made
by the completion script itself, just like `-H`.

Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-03 19:03:43 +02:00
Harald Albers 69cde5a302 Filter completions of `docker inspect` by `--type`
Completion now filters the images and containers by given
`--type`.

Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-01 08:36:00 -07:00
Harald Albers aab82c5c22 Fix completion of commands after a global option with arg
Without this fix, `docker -l info ` would not complete the commands.

Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-31 20:16:33 +02:00
Harald Albers e0dad9a153 Add completion of global options to `docker daemon`
It's a bit confusing: the "global options" are valid as "global options"
for all client commands (i.e. all but daemon).
Example: `docker --log-level info run`

For `docker daemon`, these "global options" are only valid as "command
options".
Example: `docker daemon --log-level info`

As command completion cannot tell which command the user is going to
type next, completion for the daemon command has to allow illegal
syntaxes like
`docker --log-level info daemon --log-level info`

Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-31 20:06:45 +02:00
Harald Albers 8cc8ee9254 Add `docker daemon` to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-30 14:08:55 -04:00
Dieter Reuter 37169dadda Fix file mode for docker bash completion
A bash completion file shouldn't have a executable bit set.
Just change file mode to 644 (instead of 755).

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2015-07-27 22:07:04 +02:00
Harald Albers de40f3997a Complete all known driver options if no log driver was specified
Without this fix, `docker --log-opt ` would not complete anything
because the completions were driver specific.

Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-23 14:19:13 +02:00
Harald Albers 6de8dd1a6e Fix problem with = in completion of docker global options
Without this fix, `docker --log-driver fluentd --log-opt fluentd-tag=b`
would complete `b` to `build`.
Completion of the commands has to be nailed to __docker_pos_first_nonflag

Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-23 13:52:06 +02:00
Lei 877dbbbde8 Add ulimit to docker build.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-07-23 10:26:06 +08:00
Harald Albers d5aeb3398b Second level completions for --log-opt
Advanced completion for some log driver options:
gelf-address, syslog-address, syslog-facility.

Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-21 08:25:14 +02:00
Harald Albers 38acec94c4 Completion: Add support for '=' in arguments to __docker_pos_first_nonflag
This solves several problems that arise from the special treatment of
"=" in Bash.
The fix was required as some log drivers have options in a key=value
form. It also addresses the --option=value and the negated boolean syntax
(--boolean=false).

Note that this is not a general fix for these problems, it is limited to
the __docker_pos_first_nonflag function.

Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-20 21:22:56 +02:00
Harald Albers faa8b658e7 Driver-specific completions for --log-opt
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-20 20:24:01 +02:00
Harald Albers e09d0febe6 Add missing log drivers to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-20 20:13:59 +02:00
Mrunal Patel d77d0268eb Adds documentation for additional groups.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-07-13 14:47:28 -04:00
Harald Albers ea26b38784 Add some missing events to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-07 09:04:15 +02:00
Shishir Mahajan 2cb74e6915 Flag Addition: --type flag added for docker inspect command
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-07-01 12:14:01 -04:00
Harald Albers b2832dffe5 Update bash completion for 1.7.0
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-29 12:42:59 +02:00
Jessica Frazelle 40b71adee3 Revert "Add docker exec run a command in privileged mode"
This reverts commit 72a500e9e5.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
2015-05-26 14:12:16 -07:00
Tianon Gravi f74d9b8672 Merge pull request #13195 from albers/completion-custom-host
respect -H in bash completion
2015-05-20 17:31:16 -07:00
Shishir Mahajan 8b2c6cb072 root dir for execdriver (/var/run/docker) should be configurable
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-05-15 09:30:36 -04:00
Harald Albers db5b4a2a69 respect -H in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-13 13:39:25 -07:00
Ahmet Alp Balkan cb9a6b9aed Add --since argument to docker logs cmd
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.

Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-05-10 20:42:14 +00:00
Ma Shimiao dccb8b5c33 add cpu.cfs_period_us support
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-05-09 10:02:46 +08:00
Tibor Vass 91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
Brian Goff f3023a93d1 Allow pulling stats once and disconnecting.
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.

Also adds a `--no-stream` flag to `docker stats` which does the same

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-05-04 10:49:13 -04:00
Tianon Gravi 380b873752 Only complete repos with "docker pull -a"
With this, `docker pull deb<tab>` will show all `debian:*` tags, as before, but `docker pull -a deb<tab>` will complete directly to just `debian`. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-01 10:04:24 -06:00