a0399720ce
Fix configuration reloading
...
There are five options 'debug' 'labels' 'cluster-store' 'cluster-store-opts'
and 'cluster-advertise' that can be reconfigured, configure any of these
options should not affect other options which may have configured in flags.
But this is not true, for example, I start a daemon with -D to enable the
debugging, and after a while, I want reconfigure the 'label', so I add a file
'/etc/docker/daemon.json' with content '"labels":["test"]' and send SIGHUP to daemon
to reconfigure the daemon, it work, but the debugging of the daemon is also diabled.
I don't think this is a expeted behaviour.
This patch also have some minor refactor of reconfiguration of cluster-advertiser.
Enable user to reconfigure cluster-advertiser without cluster-store in config file
since cluster-store could also be already set in flag, and we only want to reconfigure
the cluster-advertiser.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-06-02 00:07:30 +00:00
b610528a6a
resolve the config file from the sudo user
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-06-02 00:07:30 +00:00
aa86373f28
Add the Local Persist plugin
...
I wasn't 100% sure if it was appropriate to add plugin here, but @thaJeztah invited me to do so, so here it is!
(see https://github.com/CWSpear/local-persist/issues/17#issuecomment-188523784 )
Signed-off-by: Cameron Spear <cameronspear@gmail.com>
2017-06-02 00:07:30 +00:00
d83df084d3
Fix some flaws in man.
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
2017-06-02 00:07:30 +00:00
a429c0e84f
Docs: add note about CMD and ENTRYPOINT commands
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2017-06-02 00:07:30 +00:00
6f778ea663
docs: reference: commandline: daemon: fedora 23+ has mapping files
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-06-02 00:07:30 +00:00
beb7b68810
Add mounts to docker ps.
...
- Allow to filter containers by volume with `--filter volume=name` and `filter volume=/dest`.
- Show their names in the list with the custom format `{{ .Mounts }}`.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2017-06-02 00:07:30 +00:00
543ca10394
Update docs for enableipv6
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2017-06-02 00:07:30 +00:00
fafe6f2ab2
Fix some typos in comments and strings
...
Most of them were found and fixed by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2017-06-02 00:07:29 +00:00
06e3a6ccd0
Fix markdown style error in man page
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
2017-06-02 00:07:29 +00:00
0649b4f517
bash completion for `docker update --restart`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:29 +00:00
50f87e458e
bash completion for etwlogs logging driver
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-02 00:07:29 +00:00
fad60a834e
fix storage driver options in man page
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
2017-06-02 00:07:29 +00:00
623082a1eb
Update RestartPolicy of container
...
Add `--restart` flag for `update` command, so we can change restart
policy for a container no matter it's running or stopped.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2017-06-02 00:07:29 +00:00
776757ac28
Fix some flaws in docs
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
2017-06-02 00:07:29 +00:00
7eed2da516
Document .Names format placeholder in docker-ps man page, fixes #20503 .
...
Signed-off-by: Andrew Macpherson <hopscotch23@gmail.com>
2017-06-02 00:07:29 +00:00
15eb38dfb1
Invoke ReloadConfiguration on network controller
...
- It reverts fa163f5619bb01cabca1c21 plus a small change
in order to allow passing the global scope datastore
to libnetwork after damon boot.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-06-02 00:07:29 +00:00
79a3c42030
add a section to each volume page
...
Signed-off-by: ozlerhakan <hakan.ozler@kodcu.com>
2017-06-02 00:07:29 +00:00
65c94a34be
Add docs for --ipv6 option, also add --internal as appropriate
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2017-06-02 00:07:29 +00:00
c7b4d1c449
Fix docs
...
Fix wrong descriptions in docs
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2017-06-02 00:07:29 +00:00
56965a4d1d
Windows: Add ETW logging driver plug-in
...
Signed-off-by: Cedric Davies <cedricda@microsoft.com>
2017-06-02 00:07:29 +00:00
e56ee5769c
add missing trailing slash in ADD and COPY /absoluteDir examples. According to the specs they are mandatory.
...
Signed-off-by: Bastiaan Bakker <bbakker@xebia.com>
2017-06-02 00:07:29 +00:00
cb1279e542
Expose docker's root directory by default as part of `docker info`.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2017-06-02 00:07:29 +00:00
3969f77c86
Fixing mismatched network name.
...
Using `my-net` to be consistent with:
https://docs.docker.com/engine/reference/run/
Signed-off-by: Robert Wallis <smilingrob@gmail.com>
2017-06-02 00:07:29 +00:00
483c30a698
Fish completion lists all containers on "docker rm -f"
...
Signed-off-by: Frederik Nordahl Jul Sabroe <frederikns@gmail.com>
2017-06-02 00:07:29 +00:00
c30d9d2fff
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2017-06-02 00:07:28 +00:00
91d0d25ee4
update cap-add docs for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2017-06-02 00:07:28 +00:00
7c85fb1665
Improve usage details on overriding USER command in Docker run reference page
...
Signed-off-by: Sian Lerk Lau <kiawin@gmail.com>
2017-06-02 00:07:28 +00:00
a015293ff7
Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore)
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2017-06-02 00:07:28 +00:00
680de96eb6
Before and since filters documentation
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2017-06-02 00:07:28 +00:00
a26c02199d
Make it clear that env vars must be simple
...
Closes #20169
Signed-off-by: Doug Davis <dug@us.ibm.com>
2017-06-02 00:07:28 +00:00
fcad8ce206
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>
2017-06-02 00:07:28 +00:00
904481becd
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>
2017-06-02 00:07:28 +00:00
a9dd907004
Add Horcrux volume plugin to plugins.md
...
Signed-off-by: Muthukumar R <muthur@gmail.com>
2017-06-02 00:07:28 +00:00
a33942adf2
Adding --format= flag
...
Signed-off-by: Evan Allrich <evan@unguku.com>
2017-06-02 00:07:28 +00:00
aa46699081
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>
2017-06-02 00:07:28 +00:00
505e1673d6
Add missing debug client mode info in docs.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2017-06-02 00:07:28 +00:00
c1c6c3fe80
Fix typo in config-json man page
...
In the NAME section: "confg.json" -> "config.json"
Signed-off-by: Tom X. Tobin <tomxtobin@tomxtobin.com>
2017-06-02 00:07:28 +00:00
355a190423
Display `internal` flag on `network inspect`
...
Also adds internal network tests for bridge network
Signed-off-by: Chun Chen <ramichen@tencent.com>
2017-06-02 00:07:28 +00:00
3dd7289df6
Add some basic bash completion for seccomp values
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2017-06-02 00:07:28 +00:00
bb1e32b5e1
Add Kuryr Network Plugin to the docs
...
Signed-off-by: Mohammad Banikazemi <mb@us.ibm.com>
2017-06-02 00:07:28 +00:00
494ae5e825
Add powershell completion support
...
Initial version of powershell tab completion. It completes
commands and container names.
Signed-off-by: Sam Neirinck <sam@samneirinck.com>
2017-06-02 00:07:28 +00:00
f367aeadf3
Add note about legacy links
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-06-02 00:07:28 +00:00
361097ab17
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>
2017-06-02 00:07:27 +00:00
1a10df30ce
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>
2017-06-02 00:07:27 +00:00
e8ba17c379
Add docker-volume-ipfs plugin to the list.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-06-02 00:07:27 +00:00
17cba03948
Added link to Quobyte's volume plugin.
...
Signed-off-by: Felix Hupfeld <felix@quobyte.com>
2017-06-02 00:07:27 +00:00
235927da80
change 'host:port' to `host:port`
...
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com>
2017-06-02 00:07:27 +00:00
6f24713ba0
Fix typo
...
Signed-off-by: Prayag Verma <prayag.verma@gmail.com>
2017-06-02 00:07:27 +00:00
6a0e2f700a
Change container name to id as actual results
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2017-06-02 00:07:27 +00:00
Lei Jitang
Antonio Murdaca
Cameron Spear
Jian Zhang
Tomasz Kopczynski
David Calavera
Aidan Hobson Sayers
Stefan Weil
Zhu Guihua
Harald Albers
Zhang Wei
Andrew Macpherson
Alessandro Boch
ozlerhakan
Cedric Davies
Bastiaan Bakker
Vishnu kannan
Robert Wallis
Frederik Nordahl Jul Sabroe
Victor Vieux
Jessica Frazelle
Sian Lerk Lau
Tianon Gravi
Doug Davis
Muthukumar R
Evan Allrich
Tom X. Tobin
Chun Chen
Mohammad Banikazemi
Sam Neirinck
Sebastiaan van Stijn
Kai Qiang Wu(Kennan)
Vincent Woo
Vincent Demeester
Felix Hupfeld
qg
Prayag Verma
Wen Cheng Ma