9933657e25
Docs: add note about CMD and ENTRYPOINT commands
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl >
Upstream-commit: 1ed84770c52b0abd026fe9c1acc51f19d94fad12
Component: engine
2016-02-24 22:57:25 +01:00
97222044b9
docs: reference: commandline: daemon: fedora 23+ has mapping files
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: eb902ef25773ca670eee126351547e77f384ad9d
Component: engine
2016-02-24 15:43:28 +01:00
34876f5fef
Merge pull request #20017 from calavera/expose_volumes_in_ps
...
Add mounts to docker ps.
Upstream-commit: 034a1a8dfd17d89123bf0405f898e880575ed775
Component: engine
2016-02-24 11:08:21 +01:00
d7e2b23289
Merge pull request #20610 from justechn/fix_docs
...
Fix docs
Upstream-commit: 2ed1806b2c563e2276d81066cc492aaf7bcb145b
Component: engine
2016-02-23 13:45:29 -08:00
e61c546929
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 >
Upstream-commit: d14cef441d05f01e8f253c67ff11f954aa24a142
Component: engine
2016-02-23 11:32:28 -07:00
edf220176a
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 >
Upstream-commit: bd4fb00fb6241d35537b460a2d9f48256111ae7a
Component: engine
2016-02-23 12:10:24 -05:00
5ff2aad20c
Merge pull request #20613 from aidanhs/aphs-ipv6-docs-followup
...
Update docs for enableipv6
Upstream-commit: 20fc13b56deb4fc28cbd40ae3c67e5ca2dd9592a
Component: engine
2016-02-23 17:57:58 +01:00
39d894b6e8
Merge pull request #20581 from stweil/master
...
Fix some typos in comments and strings
Upstream-commit: 9d882cbb442138cb5c9026f1ec8eb4499ad71442
Component: engine
2016-02-23 08:20:53 -08:00
15b7542c40
Merge pull request #20590 from HackToday/fixdoc
...
Fix doc format issue
Upstream-commit: 1e02a0810ee51ec7fa572f9e35ba36cd32d7a083
Component: engine
2016-02-23 08:20:03 -08:00
13fc2a2541
Update docs for enableipv6
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: 82d486848dd2e7a0189375a62e8e38171ba9a2b1
Component: engine
2016-02-23 16:10:54 +00:00
11a259a09b
Merge pull request #20500 from ZJUshuaizhou/master
...
Update docker_remote_api_v1.22.md
Upstream-commit: 783d6c64cfd1a413cd8ce500611d0aa23ded8cb1
Component: engine
2016-02-23 14:54:01 +01:00
c78bf4e1c8
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 >
Upstream-commit: 220a188ae820fac1198c54b7f0358525457a8609
Component: engine
2016-02-23 14:34:27 +08:00
d01d130fdc
Fix doc format issue
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: 4d4d1e7f82592c4996650b92b01d9f4633e8878b
Component: engine
2016-02-23 03:42:10 +00:00
0a2d56c7a2
Merge pull request #20588 from WeiZhang555/typo
...
Fix typo
Upstream-commit: 0d808683a1e1a7c9971d2b943028d0a621d2eb21
Component: engine
2016-02-22 21:30:01 -05:00
ce26dfb6b0
Fix typo
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 2264bd95b681d1336b167c8ecd9b2ce65b963071
Component: engine
2016-02-23 10:25:24 +08:00
f62b97e499
Fix some typos in comments and strings
...
Most of them were found and fixed by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de >
Upstream-commit: 2eee613326fb59fd168849618d14a9054a40f9f5
Component: engine
2016-02-22 20:27:15 +01:00
4baeda8a40
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 >
Upstream-commit: 5642cdeac5df08414744203235462a6b99261239
Component: engine
2016-02-22 20:49:10 +08:00
13999a8cee
Merge pull request #20541 from tracylihui/20536-fix
...
Update docker_remote_api_v1.21.md to complete the docs
Upstream-commit: 1b811a8930d32e9fe984031918b397b6538f5f74
Component: engine
2016-02-21 09:27:50 +01:00
a78e8052d0
Update docs/reference/api to complete the docs
...
Signed-off-by: tracylihui <793912329@qq.com >
Upstream-commit: cc2ff8c9215e445d2504b0e4916233f72a257ee6
Component: engine
2016-02-21 10:28:07 +08:00
6da923628b
Merge pull request #20528 from cloojure/patch-3
...
Update dockernetworks.md
Upstream-commit: 3646b14ecd9c07d9d4113b5a36958d3f92484806
Component: engine
2016-02-20 23:25:51 +01:00
67a6fa7a29
Merge pull request #20542 from longliqiang88/master2.201
...
Update doc docker_remote_api_v1.20.md
Upstream-commit: 41a2bac7cfce743b1acdd415213bd12cede6fd29
Component: engine
2016-02-20 19:18:28 +01:00
b76e5dced0
Update doc docker_remote_api_v1.20.md
...
Update doc docker_remote_api_v1.20.md
Signed-off-by: longliqiang88 <394564827@qq.com >
Upstream-commit: 47e3ea7dd1a08abc86d1ef0e32b71248a0eac95e
Component: engine
2016-02-20 19:32:20 +08:00
1da6a4053e
Update docker_remote_api_v1.21.md to complete the docs
...
Signed-off-by: tracylihui <793912329@qq.com >
Upstream-commit: df3ede95ebdc708ea6fb954c8799cf14203916c2
Component: engine
2016-02-20 19:17:19 +08:00
5666b58bae
Merge pull request #20535 from hsinko/dev
...
A wrong word
Upstream-commit: dc0a69cbcdd2b782ee660a72e9eac989371872de
Component: engine
2016-02-20 11:57:29 +01:00
f153cf13ed
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 >
Upstream-commit: ff3ea4c90f2ede5cccc6b49c4d2aad7201c91a4c
Component: engine
2016-02-20 17:06:32 +08:00
d560df1e09
Update configure-dns.md
...
Modify word error
Signed-off-by: hsinko <21551195@zju.edu.cn >
Upstream-commit: 0b64280195d59643ddf529235e646d741db26455
Component: engine
2016-02-20 11:51:59 +08:00
a4f9e19fdf
Update dockernetworks.md
...
Fix truncated sentence
Signed-off-by: Alan Thompson <cloojure@gmail.com >
Upstream-commit: 549fa67dae346e8f9fe5590f914a97b1a18e46d6
Component: engine
2016-02-19 16:57:13 -08:00
48bb84c5fc
Merge pull request #20386 from zhangjianfnst/fix-some-flaws-in-docs
...
Fix some flaws in docs
Upstream-commit: 06af9471f869cd1f46da814e21c21bc815fd665e
Component: engine
2016-02-19 17:07:50 +01:00
59be9aceed
Fix typo error of dockernetworks.md
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: f03050cc4c4512f28b74ec2e8fc4bee81b72b4e0
Component: engine
2016-02-19 17:18:52 +08:00
d9c028ed66
Merge pull request #20419 from aboch/cr
...
Allow passing global datastore to libnetwork and v0.7.0-dev1 vendoring
Upstream-commit: 117a982d2e805d3279ff75fcec071635e5191ef6
Component: engine
2016-02-18 17:39:46 -08:00
6f4e1021b0
Fix some flaws in docs
...
Signed-off-by: Jian Zhang <zhangjian.fnst@cn.fujitsu.com >
Upstream-commit: cdc7f26715fbf0779a5283354048caf9faa1ec4a
Component: engine
2016-02-19 09:27:03 +08:00
fa1db664e1
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 >
Upstream-commit: ed364b69df0432d0143e7661c4c0695377ceef7b
Component: engine
2016-02-18 12:14:14 -08:00
615c87e18e
add a section to each volume page
...
Signed-off-by: ozlerhakan <hakan.ozler@kodcu.com >
Upstream-commit: 910ea8adf6c2c94fdb3748893e5b1e51a6b8c431
Component: engine
2016-02-18 21:52:15 +02:00
7d665cca4e
Merge pull request #17513 from aidanhs/aphs-expose-ipv6-default-bridge
...
Expose bridge IPv6 setting to `docker network inspect`
Upstream-commit: 2e6c841b826cc73332c44d5a04a5996fc65af724
Component: engine
2016-02-18 10:35:04 -08:00
164f49c5e5
Merge pull request #20438 from YeZhenan/nodejs_web_app-update
...
update the dockfile of dockerizing a Node.js app.
Upstream-commit: 84d2d6acddb853fa8e2071d5d43e5364200f9b32
Component: engine
2016-02-18 19:17:59 +01:00
22c38da429
Merge pull request #20415 from thaJeztah/improve-seccomp-warning
...
Be more explicit on seccomp availability
Upstream-commit: 1f97f2232db75a9e1e2afd63894c98266a87b7d7
Component: engine
2016-02-18 15:18:36 +01:00
4c5186de7e
update the file of dockerizing a Node.js app.
...
Signed-off-by: Zhenan Ye <21551168@zju.edu.cn >
Upstream-commit: 883b0567f2c96cb5cbcc31e5b02938bcc6d5877f
Component: engine
2016-02-18 06:12:11 -08:00
b800719b7b
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 >
Upstream-commit: 13839a6d328692c672394811ee3afd9a168fc328
Component: engine
2016-02-18 14:57:47 +01:00
2884a8cafd
Merge pull request #20425 from HackToday/fixindex
...
Fix wrong index marking
Upstream-commit: a9c73b1a7ebe4ccd6893f37d2515be94000d081a
Component: engine
2016-02-18 14:49:15 +01:00
59522de764
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 >
Upstream-commit: 0b4e0ce7cda357904342d41ea139519b8bbf755b
Component: engine
2016-02-18 03:08:21 +00:00
00d55504d4
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 >
Upstream-commit: f7fe2f0992126d45802a376b6da760d4e2b8607c
Component: engine
2016-02-18 02:58:26 +00:00
5aea778205
Merge pull request #19689 from cednation/etwlogs
...
Windows: Add ETW logging driver plug-in
Upstream-commit: c795d0bab9057fbf16ca70349bcc37e244be33b9
Component: engine
2016-02-16 15:01:17 -08:00
6396772da2
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 >
Upstream-commit: f982f08c5097e25b901152289faf960d557c130e
Component: engine
2016-02-16 22:52:16 +01:00
442a84b35d
Windows: Add ETW logging driver plug-in
...
Signed-off-by: Cedric Davies <cedricda@microsoft.com >
Upstream-commit: 3fe60bbf95b60f1a1e847a48e1c9b9730e570dff
Component: engine
2016-02-16 13:24:49 -08:00
ddc0af4e6a
Merge pull request #19986 from vishh/expose-root-dir
...
Expose docker's root directory by default as part of `docker info`.
Upstream-commit: 80187df25708782db20846e63aef7ddb0419c7cf
Component: engine
2016-02-16 12:57:57 -08:00
9315309e4c
Expose docker's root directory by default as part of docker info.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com >
Upstream-commit: 6a3176d4fee3e747ecb6b2d27ab2eb68471f3f8f
Component: engine
2016-02-16 10:40:15 -08:00
1edac85cca
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 >
Upstream-commit: 8779a4ca62db8b64c5016be20456d5b2e5a407e9
Component: engine
2016-02-15 13:17:05 -08:00
e1a8ad7624
Fix documentation typos
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7da5784b10a9f085af98984e6e69e733e55ddbf5
Component: engine
2016-02-15 15:46:56 +01:00
e92dd3c4a5
Merge pull request #20280 from rhuss/patch-2
...
Add network mode `none` to list of possible values
Upstream-commit: 7d9532552b433581253898052849524500a21ff5
Component: engine
2016-02-13 14:21:27 +01:00
d4a856da9f
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 >
Upstream-commit: c80b36c938306ef9cc9ad6865cfc251a694f59aa
Component: engine
2016-02-13 10:00:51 +01:00
