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
2ed1806b2c
Merge pull request #20610 from justechn/fix_docs
...
Fix docs
2016-02-23 13:45:29 -08:00
Ryan McLaughlin
d14cef441d
fixing the path of the key pair
...
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>
Fixed a bit of grammar
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>
2016-02-23 11:32:28 -07: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
David Calavera
1e02a0810e
Merge pull request #20590 from HackToday/fixdoc
...
Fix doc format issue
2016-02-23 08:20:03 -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
Vincent Demeester
783d6c64cf
Merge pull request #20500 from ZJUshuaizhou/master
...
Update docker_remote_api_v1.22.md
2016-02-23 14:54:01 +01: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
Kai Qiang Wu(Kennan)
4d4d1e7f82
Fix doc format issue
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-23 03:42:10 +00:00
Brian Goff
0d808683a1
Merge pull request #20588 from WeiZhang555/typo
...
Fix typo
2016-02-22 21:30:01 -05:00
Zhang Wei
2264bd95b6
Fix typo
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-23 10:25:24 +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
3646b14ecd
Merge pull request #20528 from cloojure/patch-3
...
Update dockernetworks.md
2016-02-20 23:25:51 +01: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
Sebastiaan van Stijn
dc0a69cbcd
Merge pull request #20535 from hsinko/dev
...
A wrong word
2016-02-20 11:57:29 +01: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
hsinko
0b64280195
Update configure-dns.md
...
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn>
2016-02-20 11:51:59 +08:00
Alan Thompson
549fa67dae
Update dockernetworks.md
...
Fix truncated sentence
Signed-off-by: Alan Thompson <cloojure@gmail.com>
2016-02-19 16:57:13 -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
Wen Cheng Ma
f03050cc4c
Fix typo error of dockernetworks.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-02-19 17:18:52 +08: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
Sebastiaan van Stijn
84d2d6acdd
Merge pull request #20438 from YeZhenan/nodejs_web_app-update
...
update the dockfile of dockerizing a Node.js app.
2016-02-18 19:17:59 +01:00
Sebastiaan van Stijn
1f97f2232d
Merge pull request #20415 from thaJeztah/improve-seccomp-warning
...
Be more explicit on seccomp availability
2016-02-18 15:18:36 +01:00
Zhenan Ye
883b0567f2
update the file of dockerizing a Node.js app.
...
Signed-off-by: Zhenan Ye <21551168@zju.edu.cn>
2016-02-18 06:12:11 -08:00
Sebastiaan van Stijn
13839a6d32
Be more explicit on seccomp availability
...
Seccomp is only *compiled* in binaries built for
distros that ship with seccomp 2.2.1 or higher,
and in the static binaries.
The static binaries are not really useful for
RHEL and CentOS, because devicemapper does
not work properly with the static binaries,
so static binaries is only an option for Ubuntu
and Debian.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-18 14:57:47 +01:00
Sebastiaan van Stijn
a9c73b1a7e
Merge pull request #20425 from HackToday/fixindex
...
Fix wrong index marking
2016-02-18 14:49:15 +01:00
Kai Qiang Wu(Kennan)
0b4e0ce7cd
Fix wrong index marking
...
The index was wrong set in docs, so let's fix it
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-18 03:08:21 +00:00
Kai Qiang Wu(Kennan)
f7fe2f0992
Add sudo for related command
...
The du need sudo to perform to get correct results.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-18 02:58:26 +00: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
Sebastiaan van Stijn
7da5784b10
Fix documentation typos
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-15 15:46:56 +01:00
Vincent Demeester
7d9532552b
Merge pull request #20280 from rhuss/patch-2
...
Add network mode `none` to list of possible values
2016-02-13 14:21:27 +01: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
David Calavera
b734d0e8cc
Merge pull request #20285 from moxiegirl/fix-user-guide
...
Update the userguide to fix user feedback
2016-02-12 11:07:03 -08:00
Mary Anthony
bf76b1d686
Update the userguide to fix user feedback
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-12 10:08:59 -08:00