Commit Graph

76 Commits

Author SHA1 Message Date
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
0f6be90129 fix wrong tab completion
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: f86dcef486
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
5b40eb5af0 Add --ulimit and --default-ulimit to bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d8c4619844
Component: cli
2017-06-02 00:06:49 +00:00
d62485cc11 Add bash completion for docker events --filter and --until.
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9690067dee
Component: cli
2017-06-02 00:06:49 +00:00
d8f9782fd3 Remove subdirectories MAINTAINERS files
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 80728bcd7b
Component: cli
2017-06-02 00:06:48 +00:00
348a220c93 Fix docker build and docker run bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5bc113a640
Component: cli
2017-06-02 00:06:48 +00:00
6e5bdec15f zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

ef4a3fce0437 Update completion for `wait' as per 1.5.0
ace5aa9c1282 Add completion for `stats'
91f112834865 Update completion for `search' as per 1.5.0
a5e4febe4bf6 Update completion for `save' as per 1.5.0
1cdbdb18a384 Add completion for `rename'
2f004bb724b9 Update completion for `pull' as per 1.5.0
773b88e0885b Update completion for `logs' as per 1.5.0
c57e5d5c4551 Update completion for `load' to favor archive files
9af7d12b487e Update completion for `images` as per 1.5.0
0d59e66aff30 update completion for `exec' to complete on commands
46b6c66760d7 Update completion for `events' as per 1.5.0
307e0bdc4c34 Update completion for `commit' as per 1.5.0
c4b331f38cc4 Update completion for `build' as per 1.5.0

Also added myself in the `MAINTAINERS` file.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: e49fa872b4
Component: cli
2017-06-02 00:06:47 +00:00
7719cf0e1f Shorten help messages for docker cmd flags
In order to fit printed messages to fit 80 chars,
rewording messages for `-H` and `--tls` flags.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: ee1b138b2b
Component: cli
2017-06-02 00:06:47 +00:00
7ee27fd32c Add bash completion for docker rename
Signed-off-by: Mike Dillon <mike@embody.org>
Upstream-commit: ceee2175bd
Component: cli
2017-06-02 00:06:47 +00:00
fd50a93b59 Fix bash completion for docker run -d
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3bb3eae782
Component: cli
2017-06-02 00:06:47 +00:00
8ec6a20c55 Update docker.fish
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Signed-off-by: Coenraad Loubser <coenraad@wish.org.za>
Upstream-commit: 01187a4030
Component: cli
2017-06-02 00:06:46 +00:00
6d25d34bba Bash completion for docker kill
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 063a4f574a
Component: cli
2017-06-02 00:06:46 +00:00
875d536e72 Update fish completion for 1.5.0
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: dc7a9b9c0e
Component: cli
2017-06-02 00:06:46 +00:00
b52831aaaf Add completion for stats.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e6158378b5
Component: cli
2017-06-02 00:06:46 +00:00
d76dbb5c6d Add bash completions for daemon flags, simplify with extglob
Implementing the deamon flags the traditional way introduced even more
redundancy than usual because the same list of options with flags
had to be added twice.

This can be avoided by using variables in the case statements when
using the extglob shell option.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0dafe480ab
Component: cli
2017-06-02 00:06:46 +00:00
a7ed566eb0 Add build --pull and evenets --filter flags to the docs for 1.4
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 11c19fc0f3
Component: cli
2017-06-02 00:06:45 +00:00
f57d12a5d7 Explicitly mention that '-P' maps to random ports
as noted in https://github.com/boot2docker/boot2docker/issues/690

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: d8d520cfbc
Component: cli
2017-06-02 00:06:44 +00:00
8339d95317 Sort options in bash completion alphabetically
This introduces a sort order for options:

Arrange options sorted alphabetically by long name with the short
options immediately following their corresponding long form.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3fb5792b25
Component: cli
2017-06-02 00:06:44 +00:00
e3a5916d4a Add missing options to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1d3be0eae9
Component: cli
2017-06-02 00:06:44 +00:00
a5eb2e896f Refactor completion for docker run and docker create
_docker_run and _docker_create had only one differing line.

This refactoring features:

- direct completion for both commands to the same function
- factor out the common arguments, sort & format them nicely
- compute the argument for _docker_pos_first_nonflag.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ce7267e597
Component: cli
2017-06-02 00:06:43 +00:00
58884a83d3 Update fish shell completions.
Fixes #9550

Signed-off-by: Barnaby Gray <barnaby@pickle.me.uk>
Upstream-commit: 6a94570d5a
Component: cli
2017-06-02 00:06:43 +00:00
c792fd44dd fixes as per feedback
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 640fabe8da
Component: cli
2017-06-02 00:06:43 +00:00
84ddb26bc1 Try out a different phrase for --icc
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 87353ddc98
Component: cli
2017-06-02 00:06:43 +00:00
31e804025e Man: describe --icc option better
Current description is misleading. It make an impression the --icc=false
prevents containers to talk with each other.

Signed-off-by: Michal Minar <miminar@redhat.com>

Docker-DCO-1.1-Signed-off-by: Michal Minar <miminar@redhat.com> (github: SvenDowideit)
Upstream-commit: 0f2e87fcf8
Component: cli
2017-06-02 00:06:42 +00:00
f6d19e6000 Minor bash completion cleanup
The -n and --networking options were removed because they are
unsupported. 
Bash completion should not reveal the existence of otherwise
undocumented unsupported options.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3addb4d642
Component: cli
2017-06-02 00:06:42 +00:00
17cd5ae6d6 Add missing options to bash completion for the run and create commands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 055b224c90
Component: cli
2017-06-02 00:06:42 +00:00
138a6b67c4 zsh: correctly parse available subcommands
A lot of flags have been added on the output of `docker help`. Use a
more robust method to extract the list of available subcommands by
spotting the `Command:` line and the next blank line.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 69d7e8443d
Component: cli
2017-06-02 00:06:41 +00:00
0b8c579ffe Updated sig-proxy text also in zsh completion script
Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 0205c641fa
Component: cli
2017-06-02 00:06:41 +00:00
13768dcc5d Corrected description of --sig-proxy
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: fec9e65e60
Component: cli
2017-06-02 00:06:40 +00:00
e97e6e3e85 makes the -s --size option documentation clearer #8950
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ef4fe0e404
Component: cli
2017-06-02 00:06:40 +00:00
d8ba847ba4 Adding self to various maintainers files.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: d83b068933
Component: cli
2017-06-02 00:06:37 +00:00
be92ef689d zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

The major change since the last merge is the addition of
exec/create (but they were already present in the docker repository) as
well as pause/unpause/logout/events and the use of short/long options
when they are available. Some missing options were also added.

12f00abd7178 Add completion for `exec'
4e2faa075f9a Merge `run' and `create' commands.
34134de077de Add missing long/short options for most commands.
d09f62339ab5 Add completion for `pause' and `unpause'
e4754c3b3b9d Add completion for `logout'
e0935eb3d5d2 Add completion for `events'
dae353cb9afb Add completion for `create`

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
Upstream-commit: c55facc917
Component: cli
2017-06-02 00:06:37 +00:00
5d0a93226f Fix support for --env-file in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f1a49f2560
Component: cli
2017-06-02 00:06:37 +00:00
9bfc7548cb Optimize the bash completion even further
The biggest/bestest change here is cutting down on the number of calls to Docker in the filtering helpers (`__docker_containers_running`, etc), especially calls to the really heavy `docker images`.

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: f071599471
Component: cli
2017-06-02 00:06:36 +00:00
8147491203 add bash completion support for pause and unpause
Signed-off-by: Michael Scharf <github@scharf.gr>
Upstream-commit: e775b26a78
Component: cli
2017-06-02 00:06:36 +00:00
7038ac21eb Add --security-opts options to allow user to customize security configuration
security-opts will allow you to customise the security subsystem.

For example the labeling system like SELinux will run on a container.

    --security-opt="label:user:USER"   : Set the label user for the container
    --security-opt="label:role:ROLE"   : Set the label role for the container
    --security-opt="label:type:TYPE"   : Set the label type for the container
    --security-opt="label:level:LEVEL" : Set the label level for the container
    --security-opt="label:disabled"    : Turn off label confinement for the container

Since we are passing a list of string options instead of a space separated
string of options, I will change function calls to use InitLabels instead of
GenLabels.  Genlabels interface is Depracated.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 5619082f2b
Component: cli
2017-06-02 00:06:35 +00:00
c43880d27f Add create to contrib/completion
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 442ac2bc31
Component: cli
2017-06-02 00:06:34 +00:00
a4d64054d2 Add exec to autocompletions
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 98c2ff06ed
Component: cli
2017-06-02 00:06:34 +00:00
44c59108ac zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

The major change since the last merge is the removal of use of
sed/awk. This should help a lot OSX users who previously had to install
gawk and gsed.

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
Upstream-commit: 0296063f1e
Component: cli
2017-06-02 00:06:33 +00:00
710d6cbfe3 Add --force-rm to docker build command completion
Signed-off-by: Thomas LEVEIL <thomasleveil@gmail.com>
Upstream-commit: 0678d92b26
Component: cli
2017-06-02 00:06:33 +00:00
5aea8966bf zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
Upstream-commit: 6f99c854b6
Component: cli
2017-06-02 00:06:31 +00:00