adf210319c
Merge pull request #25556 from vieux/plugin_description
...
add description in docker plugin ls
Upstream-commit: ed1a313d8f03ce1cc2eef56e66644fccb4d61eaa
Component: engine
2016-08-11 14:08:50 +02:00
3344338b88
Merge pull request #25604 from allencloud/add-missing-fields-in-volume-api
...
add fields in volume api for 1.24, 1.25
Upstream-commit: a3432c2fdbc2bdab15e49599815f42660904fdd9
Component: engine
2016-08-11 14:03:25 +02:00
0eb3f4278c
add fields in volume api for 1.24, 1.25
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b015fd4fb3a8def4812491bae702275efc6ab0cb
Component: engine
2016-08-11 19:56:17 +08:00
78c72ac827
Merge pull request #25611 from lixiaobing10051267/masterJoin
...
docker swarm join command has no flag '--swarm-token'
Upstream-commit: f1101ebf3e8fed953528c30bb7d329857fb58805
Component: engine
2016-08-11 13:30:07 +02:00
ea7fd73f3c
docker swarm join command has no flag 'X--swarm-token'
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fcf732117df0d4a57202cc056ee9c24749745bd4
Component: engine
2016-08-11 19:49:38 +08:00
ed03b3e574
Merge pull request #25610 from lixiaobing10051267/masterSwarm
...
optimize some descriptions for swarm nodes.md
Upstream-commit: 81fca603a4c828a7bca882cd504cc32b0a7b0d1d
Component: engine
2016-08-11 13:29:47 +02:00
a0f2fd5022
optimize some descriptions for swarm nodes.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fa52bd5cf8f8e40189a0a9ba1bac61bd5ace4a91
Component: engine
2016-08-11 19:07:56 +08:00
ca39dfa474
Merge pull request #25573 from thaJeztah/improve-runmetrics-layout
...
docs: improve layout for runmetrics
Upstream-commit: a19029a719f209f1bf2e760f11225027787550e2
Component: engine
2016-08-11 10:43:15 +02:00
4074463266
Merge pull request #25585 from yongtang/22311-log-opts-map
...
Update docs so that log-opts takes map (`{}`) instead of `[]`
Upstream-commit: e42cc1f6c53a139e08c28dee607105eecafc029e
Component: engine
2016-08-11 09:55:25 +02:00
1383b4fbda
Merge pull request #25590 from thaJeztah/add-node-force-remove-api-docs
...
Add node remove "force" parameter to 1.25 API docs
Upstream-commit: e26c35408d178e8f6b7c57e26dc57c6fa611622c
Component: engine
2016-08-11 09:47:41 +02:00
4fe64ab5f6
Fix events "since" / "until" query parameter description
...
The "since" query parameter can be *useful*
for polling (in combination with "until"), but
doesn't actualy stop the endpoint from streaming
events.
This patch updates the description to better
clarify that "since" does not make the endpoint
non-streaming.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ceed39b530838451b5b9c64b372307a0cc8492ab
Component: engine
2016-08-10 23:17:04 +02:00
fcebb07e97
Add node remove "force" parameter to 1.25 API docs
...
This parameter was documented for 1.24, but we
forgot to add it to the 1.25 docs as well.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 06fa5c12e8a0a4a6ed5766ff123fff06343c603c
Component: engine
2016-08-10 23:01:17 +02:00
f7227f216b
add description in docker plugin ls
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 16d5fbfd9aa28d6dab250452b30b51b7916b0888
Component: engine
2016-08-10 13:06:18 -07:00
e6d8343517
Update docs so that log-opts takes map ({}) instead of []
...
This fix updates docs so that log-opts takes map (`{}`) instead
of `[]`, as is defined in the impmenetation (`map[string]string`)
This fix fixes 22311.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f9ef1c892d2ed345ac8ab83977bc710a8c13d652
Component: engine
2016-08-10 12:50:10 -07:00
8ab414f46c
Improve layout for runmetrics
...
Change bullet-lists to tables
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 29fb644c189d710823540a06128a1e0ff6c01282
Component: engine
2016-08-10 18:42:43 +02:00
abb7fbbaec
update intro to say there are four things to consider
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 9c37bf9f1fc28ef28dc62ea496e6f56dafcdfd89
Component: engine
2016-08-10 08:45:24 -07:00
058048cb32
Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs
...
Add delete and update API documentation
Upstream-commit: 2f167a760904f5cf4f6250a55aa8f735fba74594
Component: engine
2016-08-10 08:01:13 +02:00
fe7b1d72f0
Merge pull request #23391 from Microsoft/WindowsSandboxSize
...
Windows: Added support for storage-opt size
Upstream-commit: 04e021d7511fcfdc0838a0165f70a4772c0e7718
Component: engine
2016-08-09 15:34:39 +02:00
1934f7b605
Merge pull request #25530 from thaJeztah/docs-update-image-load-response
...
docs: add missing "quiet" parameter for image/load and update response
Upstream-commit: 06e3ea141707bc3a1d31a18c4768ed6bbf3976d4
Component: engine
2016-08-09 15:26:16 +02:00
7cd50dad87
Add delete and update API documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: da325c035df5f9d733c130bb57065cad2c9bf7fc
Component: engine
2016-08-09 14:50:46 +02:00
46019ac375
Update example output for node inspect
...
commit 41d580c7a610d8111dc63353cbd94319ca854627 added
"Joined at" to the output of node inspect,
but I forgot that docs changes are needed.
This change updates the example output
of node inspect in the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dcb052c12bf6e67184d0cb6a69daf39c25666cfe
Component: engine
2016-08-09 13:04:35 +02:00
d4747af3dc
docs: add missing "quiet" parameter for image/load and update response
...
Progress reporting during image load was added
in 415dd8688618ac2b3872c6a5b5af3afcef2c3e10, but
the corresponding query-parameter was not documented
in the API docs.
This updates the API docs, and adds a response example
both with quiet enabled and disabled.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d13ed38471decb332e9a0872854a97730d548583
Component: engine
2016-08-09 12:08:33 +02:00
b5bd5a422a
docs: add missing content-type header for image load
...
Without a content-type header, Go uses a max post size
of 10 megabytes, which makes loading images fail
if they're larger than 10 megabytes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3892ac7e9418547785c36c91c3fb49a9c876c4b1
Component: engine
2016-08-09 10:56:49 +02:00
0993849fc3
fix overlay network example
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 0277eb9a32d96e11cbfe3c98229008ad29392a3f
Component: engine
2016-08-08 14:08:10 -07:00
b2d7ec8107
Merge pull request #20848 from WeiZhang555/move-rm-to-daemon
...
Move --rm to daemon side
Upstream-commit: 31e3970394998547d64e1220bd437a4c9c1061e3
Component: engine
2016-08-08 22:11:06 +02:00
d56ceaaede
Add docs for auto-removal on daemon
...
Docs for #20848 : move "--rm" to daemon side.
Add description for introduced API changes.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 7df815d2afe006ece9a3bc5c0642bd7643f40124
Component: engine
2016-08-09 00:47:12 +08:00
b5cfc0f922
update go-units vendor to newest version
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: fc63bb83caea1baf4d3818b1c8c59f83e9db6f81
Component: engine
2016-08-09 00:10:19 +08:00
34a323258f
Wait container's removal via Events API
...
If AutoRemove is set, wait until client get `destroy` events, or get
`detach` events that implies container is detached but not stopped.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 6dd8e10d6ed7a7371c5c1824ad58c4403a7b3bfd
Component: engine
2016-08-08 22:46:53 +08:00
63356b5588
Merge pull request #23718 from yongtang/23498-entrypoint-unset
...
Allow unset `--entrypoint` in `docker run` or `docker create`
Upstream-commit: 2684459ed433125257ffde5e95666ff785f26ec2
Component: engine
2016-08-08 14:38:01 +02:00
8b07fc75ff
Fix typo for docker swarm description
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: eb4b965ddbe0c351df45dfd81b32c08c7194d804
Component: engine
2016-08-08 14:47:15 +08:00
a9989e0c56
Merge pull request #25457 from sfsmithcha/add_force_remove_to_admin_guide
...
add force remove to admin guide, clean up usage of Raft, cluster -> s…
Upstream-commit: 59b03240b17d5c1fdd18e629e614dc5cffc6c536
Component: engine
2016-08-06 09:16:23 +02:00
7a49d47322
add force remove to admin guide, clean up usage of Raft, cluster -> swarm, fix some organization
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 6c38e6877aa4cfddee018a5bdfee6a9bbcbcc646
Component: engine
2016-08-05 17:27:10 -07:00
faec4a3727
fix typo, change sample cert expiry value
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 8e53390b5101ae30a13fc40f2c2a52019f8b4906
Component: engine
2016-08-05 16:51:07 -07:00
0c71c314fa
Update documentation for entrypoint unset with docker run/create
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 26c913cb6054236e2df5b4a1fcdc5708c4be8f4c
Component: engine
2016-08-05 16:35:25 -07:00
44fa57fb1b
Merge pull request #22770 from twistlock/22729_dynamic_authz_reload
...
Enable to dynamically reload authorization plugins via daemon.config
Upstream-commit: b2b3cb7be92b97150c9be96c606c0ab0a383d2ec
Component: engine
2016-08-05 19:38:40 +02:00
7ad5ac8d06
update D4M D4W advisory in swarm tutorial
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: bd15725519453b13802f1b94f2d61ec04b73d266
Component: engine
2016-08-05 09:13:39 -07:00
6a3509b302
Sync API docs
...
This synchronizes formatting changes to older
versions of the API
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5696c47470a3163d70b3518657f88534787e9fc3
Component: engine
2016-08-05 17:44:58 +02:00
0aa5d77457
Merge pull request #25405 from thaJeztah/fix-api-markdown
...
Fix Markdown formatting in API docs
Upstream-commit: 66671d4ec29d7ccbd991399b8b98705e57b6a3eb
Component: engine
2016-08-05 17:44:15 +02:00
d006708306
Merge pull request #23475 from vdemeester/add-format-flag-to-network-and-volume-ls
...
Add format flag to network and volume ls
Upstream-commit: 1ccd9d31372c41aaac5bc9972122348b1007ea14
Component: engine
2016-08-05 15:17:45 +02:00
fb8eea7ff0
Merge pull request #25096 from vieux/docker_plugin_remove_force
...
Add --force to docker plugin remove
Upstream-commit: 85428a1a53292684be55de9de3646e8c4745c72e
Component: engine
2016-08-05 14:45:05 +02:00
74f20fa606
Fix typo in run command documentation
...
Signed-off-by: Kevin Richardson <kevin@kevinrichardson.co >
Upstream-commit: b3913024e252e9cb1e7cba75e3f95cb23cedaf9b
Component: engine
2016-08-05 07:35:16 -04:00
7c2f803204
Remove git conflict markers
...
Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com >
Upstream-commit: 34278b3301c0ca339d32a90264f0018e35a1e7e9
Component: engine
2016-08-05 09:41:45 +02:00
4183fa25d5
Remove "-rc" from documentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4f7b731a26bf43c03687fab35c2f30cfd827bade
Component: engine
2016-08-05 01:38:18 +02:00
d5f439ee89
Add --force to docker plugin remove
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 0016b331dac94661678fd7676c7b6ccc9ec2d147
Component: engine
2016-08-04 15:55:45 -07:00
5a0f28bcec
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
...
Signed-off-by: Avi Vaid <avaid1996@gmail.com >
Upstream-commit: 570bad1974e767525ef513e48a0df19fc8b49e0c
Component: engine
2016-08-04 15:07:20 -07:00
b837103bde
Add volume --format flag to ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a488ad1a090eb0b6069f79cd045badaaa8ec1bda
Component: engine
2016-08-04 14:59:55 +02:00
33375755ad
Add network --format flag to ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a8aaafc4a3fc716bdb2c4e571e34c66eb80bbab2
Component: engine
2016-08-04 14:59:51 +02:00
a86adb0e9c
Fix Markdown formatting in API docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 33bd963cfb9396b74387f6f17dc6e86b2ca5fa9d
Component: engine
2016-08-04 14:13:30 +02:00
e9fa1f29b7
Fix service ps output format in swarm tutorial
...
These changes update the example output for `docker service ps` in the
swarm tutorial's rolling update and node draining sections to match that
produced by 1.12.0: shutdown tasks are listed and the column order and
naming has changed.
Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io >
Upstream-commit: da56fa26990aa957c9bdc5497b9856f8aff58636
Component: engine
2016-08-04 13:01:22 +03:00
18e680ce9c
Merge pull request #24736 from johnharris85/fix-sinatra-tutorial
...
Fix broken gem instructions.
Upstream-commit: 29648795cd3709063c0f4309148708bbb5a3e7bc
Component: engine
2016-08-03 19:36:19 +02:00
