centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-28 14:58:53 +07:00
Code Issues Packages Projects Releases Wiki Activity
22,570 Commits 54 Branches 28 Tags
df95474885aeaaa77eeea4c4b31a92b58fc2a67c
Commit Graph

649 Commits

Author SHA1 Message Date
Vincent Demeester
79c24a0820 Merge pull request #20736 from elchris82/master 
Changed the Example request in Remote API reference to connect a container to a network
 2016-02-29 15:06:20 +01:00
Vincent Demeester
ffd8a0e0fb Merge pull request #20776 from terryding77/doc_changes 
change container word spell in docs
 2016-02-29 10:38:06 +01:00
terryding77
adda1060aa change container word spell in docs 
Signed-off-by: terryding77 <550147740@qq.com>
 2016-02-29 16:59:53 +08:00
Vincent Demeester
20a038eca6 Merge pull request #20604 from coolljt0725/fix_reload 
Fix configuration reloading
 2016-02-29 07:14:15 +01:00
Christian Böhme
2bd365ae2f Changed the Remote API reference to connect a container to a network in v1.22 
and v1.23

Signed-off-by: Christian Böhme <development@boehme3d.de>
 2016-02-27 01:31:03 +01:00
Vincent Demeester
61d24e769d Merge pull request #20572 from runcom/sudo-user 
resolve the config file from the sudo user
 2016-02-25 16:05:25 +01:00
Lei Jitang
b9366c9609 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>
 2016-02-24 21:12:14 -05:00
Tomasz Kopczynski
1ed84770c5 Docs: add note about CMD and ENTRYPOINT commands 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-02-24 22:57:25 +01:00
Antonio Murdaca
eb902ef257 docs: reference: commandline: daemon: fedora 23+ has mapping files 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-02-24 15:43:28 +01:00
Antonio Murdaca
afde6450ee resolve the config file from the sudo user 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-02-24 15:41:00 +01:00
Sebastiaan van Stijn
034a1a8dfd Merge pull request #20017 from calavera/expose_volumes_in_ps 
Add mounts to docker ps.
 2016-02-24 11:08:21 +01:00
David Calavera
bd4fb00fb6 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>
 2016-02-23 12:10:24 -05:00
Vincent Demeester
20fc13b56d Merge pull request #20613 from aidanhs/aphs-ipv6-docs-followup 
Update docs for enableipv6
 2016-02-23 17:57:58 +01:00
David Calavera
9d882cbb44 Merge pull request #20581 from stweil/master 
Fix some typos in comments and strings
 2016-02-23 08:20:53 -08:00
Aidan Hobson Sayers
82d486848d Update docs for enableipv6 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2016-02-23 16:10:54 +00:00
ZJUshuaizhou
220a188ae8 update all the versions from v1.19 to v1.23 
update v1.22

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update all the versions docs

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>
 2016-02-23 14:34:27 +08:00
Stefan Weil
2eee613326 Fix some typos in comments and strings 
Most of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-02-22 20:27:15 +01:00
hsinko
5642cdeac5 Update docker_remote_api_v1.22.md and v1.23 to complete the docs 
Signed-off-by: hsinko <21551195@zju.edu.cn>

id in example request should be a exact value

Signed-off-by: hsinko <21551195@zju.edu.cn>

revert v1.22 doc

Signed-off-by: hsinko <21551195@zju.edu.cn>

fix tiny errors

Signed-off-by: hsinko <21551195@zju.edu.cn>
 2016-02-22 20:49:10 +08:00
Vincent Demeester
1b811a8930 Merge pull request #20541 from tracylihui/20536-fix 
Update docker_remote_api_v1.21.md to complete the docs
 2016-02-21 09:27:50 +01:00
tracylihui
cc2ff8c921 Update docs/reference/api to complete the docs 
Signed-off-by: tracylihui <793912329@qq.com>
 2016-02-21 10:28:07 +08:00
Vincent Demeester
41a2bac7cf Merge pull request #20542 from longliqiang88/master2.201 
Update doc docker_remote_api_v1.20.md
 2016-02-20 19:18:28 +01:00
longliqiang88
47e3ea7dd1 Update doc docker_remote_api_v1.20.md 
Update doc docker_remote_api_v1.20.md
Signed-off-by: longliqiang88 <394564827@qq.com>
 2016-02-20 19:32:20 +08:00
tracylihui
df3ede95eb Update docker_remote_api_v1.21.md to complete the docs 
Signed-off-by: tracylihui <793912329@qq.com>
 2016-02-20 19:17:19 +08:00
Zhang Wei
ff3ea4c90f 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>
 2016-02-20 17:06:32 +08:00
Vincent Demeester
06af9471f8 Merge pull request #20386 from zhangjianfnst/fix-some-flaws-in-docs 
Fix some flaws in docs
 2016-02-19 17:07:50 +01:00
Arnaud Porterie
117a982d2e Merge pull request #20419 from aboch/cr 
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
 2016-02-18 17:39:46 -08:00
Jian Zhang
cdc7f26715 Fix some flaws in docs 
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com>
 2016-02-19 09:27:03 +08:00
Alessandro Boch
ed364b69df Invoke ReloadConfiguration on network controller 
- It reverts fa163f5619 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>
 2016-02-18 12:14:14 -08:00
ozlerhakan
910ea8adf6 add a section to each volume page 
Signed-off-by: ozlerhakan <hakan.ozler@kodcu.com>
 2016-02-18 21:52:15 +02:00
David Calavera
2e6c841b82 Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge 
Expose bridge IPv6 setting to `docker network inspect`
 2016-02-18 10:35:04 -08:00
David Calavera
c795d0bab9 Merge pull request #19689 from cednation/etwlogs 
Windows: Add ETW logging driver plug-in
 2016-02-16 15:01:17 -08:00
Bastiaan Bakker
f982f08c50 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>
 2016-02-16 22:52:16 +01:00
Cedric Davies
3fe60bbf95 Windows: Add ETW logging driver plug-in 
Signed-off-by: Cedric Davies <cedricda@microsoft.com>
 2016-02-16 13:24:49 -08:00
David Calavera
80187df257 Merge pull request #19986 from vishh/expose-root-dir 
Expose docker's root directory by default as part of `docker info`.
 2016-02-16 12:57:57 -08:00
Vishnu kannan
6a3176d4fe Expose docker's root directory by default as part of docker info. 
Signed-off-by: Vishnu kannan <vishnuk@google.com>
 2016-02-16 10:40:15 -08:00
Robert Wallis
8779a4ca62 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>
 2016-02-15 13:17:05 -08:00
Roland Huß
c80b36c938 Extended explanation of NetworkMode's value 
* Add network mode `none` to list of possible values for API version 1.15 - 1.23
* For API version 1.21 - 1.23 add explanation that any other value is taken as a custom network's name

Signed-off-by: Roland Huß <roland@jolokia.org>
 2016-02-13 10:00:51 +01:00
Aidan Hobson Sayers
d736a9d2c3 Add docs for --ipv6 option, also add --internal as appropriate 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
 2016-02-12 01:42:15 +00:00
Victor Vieux
99a396902f fix common misspell 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-02-11 15:49:36 -08:00
Jessica Frazelle
1e92e5fdaa update cap-add docs for seccomp 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2016-02-11 13:47:08 -08:00
Sebastiaan van Stijn
d4d0b8a42b Merge pull request #20234 from kiawin/20232-improve-overriding-user-command-details 
Improve usage details on overriding USER command in Docker run refere…
 2016-02-11 18:18:26 +01:00
Tianon Gravi
b1e5c773b2 Remove "--group-add dbus" from busybox example (no dbus group in busybox anymore) 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2016-02-11 08:20:28 -08:00
Sian Lerk Lau
bc3e02b9ec Improve usage details on overriding USER command in Docker run reference page 
Signed-off-by: Sian Lerk Lau <kiawin@gmail.com>
 2016-02-12 00:05:32 +08:00
Anonmily
2c60a9cba2 Docker Remote API documentation update 
I was confused for the longest time on how to actually use and make requests against the remote API, so I think that it might help for those getting started with it to know how to actually test it out via curl. I added in parts on how to access the remote API via curl against the default unix socket, and also on how to configure the docker daemon to expose the API on a TCP port as well if desired.

Signed-off-by: Michelle Liu <michelle@michelleliu.io>
 2016-02-11 16:28:15 +01:00
Sebastiaan van Stijn
89f94ec03b Merge pull request #20161 from tkopczynski/docs-before-since-filters 
docker ps before and since filters documentation
 2016-02-11 15:32:50 +01:00
Tomasz Kopczynski
27fc78abdd Before and since filters documentation 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
 2016-02-09 20:37:33 +01:00
Doug Davis
d579490b2b Make it clear that env vars must be simple 
Closes #20169

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2016-02-08 18:02:37 -08:00
Aditi Rajagopal
47dbb59e5b Update List of Client Library Projects 
Resolves: #20110
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
 2016-02-08 16:16:42 -06:00
Brian Goff
a70d9957c3 Merge pull request #20049 from kesarion/patch-1 
added dockerizer library
 2016-02-05 20:52:07 -05:00
Alexandru Sfirlogea
1cceb854a7 added dockerizer library 
Signed-off-by: Kesarion <alexandru.sfirlogea@gmail.com>
Signed-off-by: Alexandru Sfirlogea <alexandru.sfirlogea@gmail.com>
 2016-02-05 23:49:36 +02:00