Antonio Murdaca
4d6a232fc0
Revert "resolve the config file from the sudo user"
...
This reverts commit afde6450ee7bd4a43765fdc0a9799b411276d9e4.
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2017-06-02 00:07:30 +00:00
Linus Heckemann
acc094305b
Remove experimental GraphDriver plugin type
...
Signed-off-by: Linus Heckemann <anonymouse2048@gmail.com >
2017-06-02 00:07:30 +00:00
Linus Heckemann
54afb61288
Document interfaces a plugin can implement
...
Signed-off-by: Linus Heckemann <lheckemann@twig-world.com >
2017-06-02 00:07:30 +00:00
Lei Jitang
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
Antonio Murdaca
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
Cameron Spear
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
Tomasz Kopczynski
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
Antonio Murdaca
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
David Calavera
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
Aidan Hobson Sayers
543ca10394
Update docs for enableipv6
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
2017-06-02 00:07:30 +00:00
Zhang Wei
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
Jian Zhang
776757ac28
Fix some flaws in docs
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
2017-06-02 00:07:29 +00:00
Alessandro Boch
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
ozlerhakan
79a3c42030
add a section to each volume page
...
Signed-off-by: ozlerhakan <hakan.ozler@kodcu.com >
2017-06-02 00:07:29 +00:00
Aidan Hobson Sayers
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
Bastiaan Bakker
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
Vishnu kannan
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
Robert Wallis
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
Victor Vieux
c30d9d2fff
fix common misspell
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2017-06-02 00:07:28 +00:00
Jessica Frazelle
91d0d25ee4
update cap-add docs for seccomp
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2017-06-02 00:07:28 +00:00
Sian Lerk Lau
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
Tianon Gravi
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
Tomasz Kopczynski
680de96eb6
Before and since filters documentation
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
2017-06-02 00:07:28 +00:00
Doug Davis
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
Muthukumar R
a9dd907004
Add Horcrux volume plugin to plugins.md
...
Signed-off-by: Muthukumar R <muthur@gmail.com >
2017-06-02 00:07:28 +00:00
Tom X. Tobin
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
David Calavera
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
Chun Chen
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
Mohammad Banikazemi
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
Kai Qiang Wu(Kennan)
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
Vincent Woo
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
Vincent Demeester
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
Felix Hupfeld
17cba03948
Added link to Quobyte's volume plugin.
...
Signed-off-by: Felix Hupfeld <felix@quobyte.com >
2017-06-02 00:07:27 +00:00
qg
235927da80
change 'host:port' to host:port
...
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com >
2017-06-02 00:07:27 +00:00
Prayag Verma
6f24713ba0
Fix typo
...
Signed-off-by: Prayag Verma <prayag.verma@gmail.com >
2017-06-02 00:07:27 +00:00
Wen Cheng Ma
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
Wen Cheng Ma
27686523be
docs: document options for default network driver
...
Fixes issue #18410
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2017-06-02 00:07:27 +00:00
Bryan Boreham
c1c803cbe8
Improve wording about re-assigning IP addresses
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
2017-06-02 00:07:27 +00:00
Sebastiaan van Stijn
d4fd7fd13b
Fix docs for tmpfs (pr 19688)
...
Underlying files are no longer copied to the tmpfs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-06-02 00:07:27 +00:00
David Calavera
045907a71c
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 >
2017-06-02 00:07:27 +00:00
Mary Anthony
7910f01804
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 >
2017-06-02 00:07:26 +00:00
Brian Goff
88fa05ccb4
Add note about mount propagation on systemd
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2017-06-02 00:07:26 +00:00
David Calavera
d3f2c73453
Allow network configuration via daemon config file.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2017-06-02 00:07:26 +00:00
Brian Goff
8de6a3fc71
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 >
2017-06-02 00:07:26 +00:00
Jasmine Hegman
6495ac0c5f
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 >
2017-06-02 00:07:25 +00:00
Doug Davis
fc57c3a419
Add some helper text for magical ADD
...
Closes : #15777
Signed-off-by: Doug Davis <dug@us.ibm.com >
2017-06-02 00:07:25 +00:00
Mary Anthony
32e9c9434a
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 >
2017-06-02 00:07:25 +00:00
David Calavera
2ac86ababf
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 >
2017-06-02 00:07:25 +00:00
David Calavera
9930f31f74
Verify that the configuration keys in the file are valid.
...
- Return an error if any of the keys don't match valid flags.
- Fix an issue ignoring merged values as named values.
- Fix tlsverify configuration key.
- Fix bug in mflag to avoid panics when one of the flag set doesn't have any flag.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2017-06-02 00:07:25 +00:00
Anton Polonskiy
b1fbfa3b04
fixed typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com >
2017-06-02 00:07:25 +00:00