Commit Graph

84 Commits

Author SHA1 Message Date
7528eacd46 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: e7d0fd2b23
Component: cli
2017-06-02 00:07:06 +00:00
1386a1809c Add support for kernel memory limit
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 5731775665
Component: cli
2017-06-02 00:07:06 +00:00
20d188cf61 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: 8d6fd1542f
Component: cli
2017-06-02 00:07:05 +00:00
229ae40481 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: d0fa83e285
Component: cli
2017-06-02 00:07:05 +00:00
3db9619f22 Add storage options to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cefc964f4c
Component: cli
2017-06-02 00:07:05 +00:00
ee38886f4e Add options for the json-file logging driver to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0f17194e5f
Component: cli
2017-06-02 00:07:05 +00:00
1467924768 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: a287253ec5
Component: cli
2017-06-02 00:07:05 +00:00
32fd4e2f42 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: 91300d7db0
Component: cli
2017-06-02 00:07:05 +00:00
b0c12747dd Add missing storage drivers to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9fafadf6fc
Component: cli
2017-06-02 00:07:05 +00:00
30eef932c8 Add docker ps --format to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c3bbab15c2
Component: cli
2017-06-02 00:07:05 +00:00
da30fbe58c 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>
Upstream-commit: f3f1340aa0
Component: cli
2017-06-02 00:07:04 +00:00
3851ff8dba 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>
Upstream-commit: 57062f2a44
Component: cli
2017-06-02 00:07:04 +00:00
647a177c61 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>
Upstream-commit: 3de0756fd1
Component: cli
2017-06-02 00:07:04 +00:00
925fae2cca 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>
Upstream-commit: 35e75dc3e7
Component: cli
2017-06-02 00:07:04 +00:00
ecd79f9a49 Add docker daemon to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 48ad74a01c
Component: cli
2017-06-02 00:07:04 +00:00
2bae062cf7 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>
Upstream-commit: 371f131e2a
Component: cli
2017-06-02 00:07:03 +00:00
e94877f883 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>
Upstream-commit: 4f3ba975fb
Component: cli
2017-06-02 00:07:03 +00:00
9d8a40e4ad 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>
Upstream-commit: 763ba5078d
Component: cli
2017-06-02 00:07:03 +00:00
Lei
2d2192c579 Add ulimit to docker build.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: f793c1b50c
Component: cli
2017-06-02 00:07:02 +00:00
738ed44f7d 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>
Upstream-commit: ad1ca76a0b
Component: cli
2017-06-02 00:07:02 +00:00
622fdc9393 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>
Upstream-commit: f7eb7787da
Component: cli
2017-06-02 00:07:02 +00:00
d423291b54 Driver-specific completions for --log-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d3098f54ab
Component: cli
2017-06-02 00:07:02 +00:00
31610116ef Add missing log drivers to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e00293bec8
Component: cli
2017-06-02 00:07:02 +00:00
b93f7135a0 Adds documentation for additional groups.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 7301088482
Component: cli
2017-06-02 00:07:01 +00:00
6553295dca Add some missing events to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 23256b7438
Component: cli
2017-06-02 00:07:01 +00:00
4aa2c173ed Flag Addition: --type flag added for docker inspect command
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 24e7d40f42
Component: cli
2017-06-02 00:06:59 +00:00
b291440ff0 Update bash completion for 1.7.0
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 342d0cd04c
Component: cli
2017-06-02 00:06:56 +00:00
6b897604a6 Revert "Add docker exec run a command in privileged mode"
This reverts commit 72a500e9e5929b038816d8bd18d462a19e571c99.

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

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
Upstream-commit: 05c0da3b96
Component: cli
2017-06-02 00:06:56 +00:00
ea16c04a2a respect -H in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9c413dcfc4
Component: cli
2017-06-02 00:06:56 +00:00
4ae6d04e85 root dir for execdriver (/var/run/docker) should be configurable
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 7defdb0868
Component: cli
2017-06-02 00:06:56 +00:00
62f1457cde 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>
Upstream-commit: a92995bc14
Component: cli
2017-06-02 00:06:56 +00:00
37cbf376eb add cpu.cfs_period_us support
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: edbbcc6dae
Component: cli
2017-06-02 00:06:55 +00:00
d3cd09fb11 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>
Upstream-commit: 485c6d868b
Component: cli
2017-06-02 00:06:55 +00:00
94a4f91981 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>
Upstream-commit: 14411fae61
Component: cli
2017-06-02 00:06:55 +00:00
9956e4d35a Add docs for --exec-opt and setting native.cgroupdriver.
update man pages.
update bash completion.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 734430c44c
Component: cli
2017-06-02 00:06:55 +00:00
23a611d95b Add cpu cfs quota to build
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 433f49684e
Component: cli
2017-06-02 00:06:55 +00:00
e28ed017e0 Add support cpu cfs quota
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 6c60a3415c
Component: cli
2017-06-02 00:06:54 +00:00
38c9ef629e Add docker exec run a command in privileged mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: cae7221b8d
Component: cli
2017-06-02 00:06:54 +00:00
ab684537e4 Add -u|--user flag to docker exec for running command as a different user
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3ca275df6d
Component: cli
2017-06-02 00:06:54 +00:00
f7e21a2b4b Add some missing option to bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 26c3652d5e
Component: cli
2017-06-02 00:06:53 +00:00
e326deef86 Add missing filters to bash completion for docker images and docker ps
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d0fefccd8d
Component: cli
2017-06-02 00:06:52 +00:00
8a9d154752 Do not complete --cgroup-parent as _filedir
This is a follow-up on PR 11708, as suggested by tianon.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4d5758b252
Component: cli
2017-06-02 00:06:52 +00:00
71f6d6f041 Add some run option to bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 984a0d8dee
Component: cli
2017-06-02 00:06:52 +00:00
728ca1f0bb .: remove trailing white spaces
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 1bca003519
Component: cli
2017-06-02 00:06:51 +00:00
dba480a36b Revert "Dealing with trailing whitespaces"
The validation script from #10681 is too pedantic, and does not handle
well situations like:

```
cat <<EOF   # or <<-EOF
	Whether the leading whitespace is stripped out or not by bash
	it should still be considered as valid.
EOF
```

This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3574eda4c1
Component: cli
2017-06-02 00:06:51 +00:00
05cd256c83 Dealing with trailing whitespaces
Created a validation that detects all trailing whitespaces from every
text file that isn't *.go, *.md, vendor/*,
docs/theme/mkdocs/tipuesearch*

Removed trailing whitespaces from every text file except from vendor/*
builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch* and *.md

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 1f934f1094
Component: cli
2017-06-02 00:06:51 +00:00
75d1a0ff30 restrict bash completion for hostdir arg to directories
The previous state assumed that the HOSTPATH argument referred to a
file. As clarified by moxiegirl in PR #11305, it is a directory.
Adjusted completion to reflect this.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fc2a7eea91
Component: cli
2017-06-02 00:06:51 +00:00
edbfd74dae Updates to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e2b5fc47e3
Component: cli
2017-06-02 00:06:50 +00:00
eaf96905f1 docs: api-enable-cors is deprecated,updated docs description
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 0be893a352
Component: cli
2017-06-02 00:06:49 +00:00
dede462a29 Need to support new linux capability AUDIT_READ
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: e75c4494ed
Component: cli
2017-06-02 00:06:49 +00:00