Commit Graph

1196 Commits

Author SHA1 Message Date
d6a19a45a1 Improve key specific bash subcompletions
The obscure `case "${words[$cword-2]}$prev=" in` idiom is no
longer used for key specific completions in options with map values.

The `__docker_map_key_of_current_option()` function does a much
better job.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fcad8ce206
Component: cli
2017-06-02 00:07:28 +00:00
7e815e8fc6 Check key specific bash subcompletions first
This is a refactoring in preparation of cleaning up the handling
of key specific subcompletions.

The new `__docker_map_key_of_current_option()` function will be used
instead of the `__docker_map_key_of_current_option()` idiom in the
following commit.
As this function is very specific, checks using it should be executed
before those checking for `$prev`.

This commit just moves the checks without any modification.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 904481becd
Component: cli
2017-06-02 00:07:28 +00:00
7a81734b88 Add Horcrux volume plugin to plugins.md
Signed-off-by: Muthukumar R <muthur@gmail.com>
Upstream-commit: a9dd907004
Component: cli
2017-06-02 00:07:28 +00:00
74f7c45aef Adding --format= flag
Signed-off-by: Evan Allrich <evan@unguku.com>
Upstream-commit: a33942adf2
Component: cli
2017-06-02 00:07:28 +00:00
6240dc18ff Fix mention of at sign in docs
The at sign (`@`) was being referred to in the documentation as an
ampersand (`&`).

Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
Upstream-commit: aa46699081
Component: cli
2017-06-02 00:07:28 +00:00
10582b810b Add missing debug client mode info in docs.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 505e1673d6
Component: cli
2017-06-02 00:07:28 +00:00
bc76a34c7e Fix typo in config-json man page
In the NAME section: "confg.json" -> "config.json"

Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
Upstream-commit: c1c6c3fe80
Component: cli
2017-06-02 00:07:28 +00:00
82f6dc84c6 Display internal flag on network inspect
Also adds internal network tests for bridge network

Signed-off-by: Chun Chen <ramichen@tencent.com>
Upstream-commit: 355a190423
Component: cli
2017-06-02 00:07:28 +00:00
c35b255fed Add some basic bash completion for seccomp values
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 3dd7289df6
Component: cli
2017-06-02 00:07:28 +00:00
c443e84179 Add Kuryr Network Plugin to the docs
Signed-off-by: Mohammad Banikazemi <mb@us.ibm.com>
Upstream-commit: bb1e32b5e1
Component: cli
2017-06-02 00:07:28 +00:00
2f5f29f216 Add powershell completion support
Initial version of powershell tab completion. It completes
commands and container names.

Signed-off-by: Sam Neirinck <sam@samneirinck.com>
Upstream-commit: 494ae5e825
Component: cli
2017-06-02 00:07:28 +00:00
70f2d6d348 Add note about legacy links
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f367aeadf3
Component: cli
2017-06-02 00:07:28 +00:00
f8cf1bfde4 Correct old virtual size
In new content addressable model, image no longer
have virtual size column, it is now 'size'. So we
need to update related docs about them.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 361097ab17
Component: cli
2017-06-02 00:07:27 +00:00
c569643ac6 Allow disabling of colored Docker logs via daemon flag.
Signed-off-by: Vincent Woo <me@vincentwoo.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1a10df30ce
Component: cli
2017-06-02 00:07:27 +00:00
e4699e81d4 Add docker-volume-ipfs plugin to the list.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e8ba17c379
Component: cli
2017-06-02 00:07:27 +00:00
b900386f65 Added link to Quobyte's volume plugin.
Signed-off-by: Felix Hupfeld <felix@quobyte.com>
Upstream-commit: 17cba03948
Component: cli
2017-06-02 00:07:27 +00:00
qg
92d585ccb5 change 'host:port' to host:port
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com>
Upstream-commit: 235927da80
Component: cli
2017-06-02 00:07:27 +00:00
38ad8ed13a Fix typo
Signed-off-by: Prayag Verma <prayag.verma@gmail.com>
Upstream-commit: 6f24713ba0
Component: cli
2017-06-02 00:07:27 +00:00
36955f026e Change container name to id as actual results
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 6a0e2f700a
Component: cli
2017-06-02 00:07:27 +00:00
4076bc780d update bash completions for push and pull
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 5420ca8cde
Component: cli
2017-06-02 00:07:27 +00:00
5a7e5302c6 Improve bash completion for users and groups
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 49347e571c
Component: cli
2017-06-02 00:07:27 +00:00
da0b87b3b6 bash completion for journald tag support
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 437b2748c2
Component: cli
2017-06-02 00:07:27 +00:00
bbab77622b docs: document options for default network driver
Fixes issue #18410

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 27686523be
Component: cli
2017-06-02 00:07:27 +00:00
ad22dd4523 Improve wording about re-assigning IP addresses
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: c1c803cbe8
Component: cli
2017-06-02 00:07:27 +00:00
4649915bb4 Improve bash completion for docker volume ls -f dangling
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5d1e84419a
Component: cli
2017-06-02 00:07:27 +00:00
0d0af7552d Let bash completion for docker network rm only complete custom networks
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0c473c9e9c
Component: cli
2017-06-02 00:07:27 +00:00
cce394556a Fix docs for tmpfs (pr 19688)
Underlying files are no longer copied to the tmpfs.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d4fd7fd13b
Component: cli
2017-06-02 00:07:27 +00:00
05d835a2f9 Remove cluster storage advertise from reload.
Because libnetwork won't really send container information to the new
storage anyways.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 045907a71c
Component: cli
2017-06-02 00:07:27 +00:00
3990347652 Move tar copy-up for tmpfs mounts
We cannot rely on the tar command for this type of operation because tar
versions, flags, and functionality can very from distro to distro.
Since this is in the container execution path it is not safe to have
this as a dependency from dockers POV where the user cannot change the
fact that docker is adding these pre and post mount commands.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 9796beeedb
Component: cli
2017-06-02 00:07:26 +00:00
b82ff962b6 Creating Engine specific menu
Fixing the links
Updating with Seb's comments
Adding weight
Fixing the engine aliases
Updating after Arun pushed
Removing empty file

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7910f01804
Component: cli
2017-06-02 00:07:26 +00:00
196808c668 Fix bash completion for docker volume ls --dangling=false.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0441148c7d
Component: cli
2017-06-02 00:07:26 +00:00
22f6c54f1d Add note about mount propagation on systemd
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 88fa05ccb4
Component: cli
2017-06-02 00:07:26 +00:00
cb662ca713 bash completion for docker daemon --userns-remap
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 645055b37d
Component: cli
2017-06-02 00:07:26 +00:00
7945d4aed1 Allow network configuration via daemon config file.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d3f2c73453
Component: cli
2017-06-02 00:07:26 +00:00
ee198d09c4 On container rm, don't remove named mountpoints
This makes it so when calling `docker run --rm`, or `docker rm -v`, only
volumes specified without a name, e.g. `docker run -v /foo` instead of
`docker run -v awesome:/foo` are removed.

Note that all volumes are named, some are named by the user, some get a
generated name. This is specifically about how the volume was specified
on `run`, assuming that if the user specified it with a name they expect
it to persist after the container is cleaned up.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8de6a3fc71
Component: cli
2017-06-02 00:07:26 +00:00
17e906122a Add zsh completion for 'docker cp -L --follow-link'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2e6cd43572
Component: cli
2017-06-02 00:07:26 +00:00
9e0a30c1e8 Add zsh completion for new 'docker daemon --log-opt syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify' options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 922fa19637
Component: cli
2017-06-02 00:07:26 +00:00
900f0830e2 Add zsh completion for new 'docker daemon --cluster-store-opt discovery.heartbeat discovery.ttl kv.path' options
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f73b4335ff
Component: cli
2017-06-02 00:07:26 +00:00
a6cc17338a fix minor bash completion issue on OSX (compopt)
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f9a1ff0795
Component: cli
2017-06-02 00:07:26 +00:00
d60ff884b6 bash completion for syslog over TLS log driver
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: bdfbd1d9a6
Component: cli
2017-06-02 00:07:26 +00:00
ceb1b79744 bash completion for --cluster-store-opt kv.path discovery.{heartbeat,ttl}
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d75f2e95a0
Component: cli
2017-06-02 00:07:26 +00:00
b26213077f remove zsh completion for docker tag -f
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d6d6954d61
Component: cli
2017-06-02 00:07:26 +00:00
e90086e143 remove bash completion for docker tag -f
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b50ca03b9a
Component: cli
2017-06-02 00:07:26 +00:00
c8e83c8fba bash completion for docker ps --filter status=dead
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 58013afb39
Component: cli
2017-06-02 00:07:26 +00:00
ca11a29225 bash completion for docker cp --follow-link
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4808cc1282
Component: cli
2017-06-02 00:07:26 +00:00
706dd47168 bash completion for docker images -f dangling=false
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b3bb4d45dd
Component: cli
2017-06-02 00:07:26 +00:00
e1b3e37e5c Correcting overlay -> bridge driver in run.md
Correcting `overlay` -> `bridge` driver in run.md to match the preceding paragraph.

Signed-off-by: Jasmine Hegman <jasmine@jhegman.com>
Upstream-commit: 6495ac0c5f
Component: cli
2017-06-02 00:07:25 +00:00
4980c17b3e Add some helper text for magical ADD
Closes: #15777

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: fc57c3a419
Component: cli
2017-06-02 00:07:25 +00:00
d714ffc62b Fixing missing certs article; consolidating security material
Entering comments from reviewers
Updating with Derek's comments
Fixing bad links reported by build

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 32e9c9434a
Component: cli
2017-06-02 00:07:25 +00:00
d58b556f06 Make TLSOptions and LogConfig embedded structs.
That way the configuration file becomes flag, without extra keys.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 2ac86ababf
Component: cli
2017-06-02 00:07:25 +00:00