lixiaobing10051267
fcf732117d
docker swarm join command has no flag 'X--swarm-token'
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-11 19:49:38 +08:00
Sebastiaan van Stijn
a19029a719
Merge pull request #25573 from thaJeztah/improve-runmetrics-layout
...
docs: improve layout for runmetrics
2016-08-11 10:43:15 +02:00
Vincent Demeester
e42cc1f6c5
Merge pull request #25585 from yongtang/22311-log-opts-map
...
Update docs so that log-opts takes map (`{}`) instead of `[]`
2016-08-11 09:55:25 +02:00
Vincent Demeester
e26c35408d
Merge pull request #25590 from thaJeztah/add-node-force-remove-api-docs
...
Add node remove "force" parameter to 1.25 API docs
2016-08-11 09:47:41 +02:00
Sebastiaan van Stijn
ceed39b530
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>
2016-08-10 23:17:04 +02:00
Sebastiaan van Stijn
06fa5c12e8
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>
2016-08-10 23:01:17 +02:00
Yong Tang
f9ef1c892d
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>
2016-08-10 12:50:10 -07:00
Sebastiaan van Stijn
29fb644c18
Improve layout for runmetrics
...
Change bullet-lists to tables
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-10 18:42:43 +02:00
Michael Friis
9c37bf9f1f
update intro to say there are four things to consider
...
Signed-off-by: Michael Friis <friism@gmail.com>
2016-08-10 08:45:24 -07:00
Sebastiaan van Stijn
2f167a7609
Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs
...
Add delete and update API documentation
2016-08-10 08:01:13 +02:00
Sebastiaan van Stijn
04e021d751
Merge pull request #23391 from Microsoft/WindowsSandboxSize
...
Windows: Added support for storage-opt size
2016-08-09 15:34:39 +02:00
Sebastiaan van Stijn
06e3ea1417
Merge pull request #25530 from thaJeztah/docs-update-image-load-response
...
docs: add missing "quiet" parameter for image/load and update response
2016-08-09 15:26:16 +02:00
Vincent Demeester
da325c035d
Add delete and update API documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-09 14:50:46 +02:00
Sebastiaan van Stijn
dcb052c12b
Update example output for node inspect
...
commit 41d580c7a6
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>
2016-08-09 13:04:35 +02:00
Sebastiaan van Stijn
d13ed38471
docs: add missing "quiet" parameter for image/load and update response
...
Progress reporting during image load was added
in 415dd86886
, 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>
2016-08-09 12:08:33 +02:00
Sebastiaan van Stijn
3892ac7e94
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>
2016-08-09 10:56:49 +02:00
Charles Smith
0277eb9a32
fix overlay network example
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-08 14:08:10 -07:00
Vincent Demeester
31e3970394
Merge pull request #20848 from WeiZhang555/move-rm-to-daemon
...
Move --rm to daemon side
2016-08-08 22:11:06 +02:00
Zhang Wei
7df815d2af
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>
2016-08-09 00:47:12 +08:00
allencloud
fc63bb83ca
update go-units vendor to newest version
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-09 00:10:19 +08:00
Zhang Wei
6dd8e10d6e
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>
2016-08-08 22:46:53 +08:00
Sebastiaan van Stijn
2684459ed4
Merge pull request #23718 from yongtang/23498-entrypoint-unset
...
Allow unset `--entrypoint` in `docker run` or `docker create`
2016-08-08 14:38:01 +02:00
lixiaobing10051267
eb4b965ddb
Fix typo for docker swarm description
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-08 14:47:15 +08:00
Vincent Demeester
59b03240b1
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…
2016-08-06 09:16:23 +02:00
Charles Smith
6c38e6877a
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>
2016-08-05 17:27:10 -07:00
Charles Smith
8e53390b51
fix typo, change sample cert expiry value
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-05 16:51:07 -07:00
Yong Tang
26c913cb60
Update documentation for entrypoint unset with docker run/create
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-05 16:35:25 -07:00
Vincent Demeester
b2b3cb7be9
Merge pull request #22770 from twistlock/22729_dynamic_authz_reload
...
Enable to dynamically reload authorization plugins via daemon.config
2016-08-05 19:38:40 +02:00
Charles Smith
bd15725519
update D4M D4W advisory in swarm tutorial
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-05 09:13:39 -07:00
Sebastiaan van Stijn
5696c47470
Sync API docs
...
This synchronizes formatting changes to older
versions of the API
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-05 17:44:58 +02:00
Sebastiaan van Stijn
66671d4ec2
Merge pull request #25405 from thaJeztah/fix-api-markdown
...
Fix Markdown formatting in API docs
2016-08-05 17:44:15 +02:00
Vincent Demeester
1ccd9d3137
Merge pull request #23475 from vdemeester/add-format-flag-to-network-and-volume-ls
...
Add format flag to network and volume ls
2016-08-05 15:17:45 +02:00
Vincent Demeester
85428a1a53
Merge pull request #25096 from vieux/docker_plugin_remove_force
...
Add --force to docker plugin remove
2016-08-05 14:45:05 +02:00
Kevin Richardson
b3913024e2
Fix typo in run command documentation
...
Signed-off-by: Kevin Richardson <kevin@kevinrichardson.co>
2016-08-05 07:35:16 -04:00
Patrick Böänziger
34278b3301
Remove git conflict markers
...
Signed-off-by: Patrick Bänziger <patrick.baenziger@bsi-software.com>
2016-08-05 09:41:45 +02:00
Sebastiaan van Stijn
4f7b731a26
Remove "-rc" from documentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-05 01:38:18 +02:00
Victor Vieux
0016b331da
Add --force to docker plugin remove
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-04 15:55:45 -07:00
Avi Vaid
570bad1974
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
...
Signed-off-by: Avi Vaid <avaid1996@gmail.com>
2016-08-04 15:07:20 -07:00
Vincent Demeester
a488ad1a09
Add volume --format flag to ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-04 14:59:55 +02:00
Vincent Demeester
a8aaafc4a3
Add network --format flag to ls
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-04 14:59:51 +02:00
Sebastiaan van Stijn
33bd963cfb
Fix Markdown formatting in API docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-04 14:13:30 +02:00
Ilkka Laukkanen
da56fa2699
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>
2016-08-04 13:01:22 +03:00
Sebastiaan van Stijn
29648795cd
Merge pull request #24736 from johnharris85/fix-sinatra-tutorial
...
Fix broken gem instructions.
2016-08-03 19:36:19 +02:00
Charles Smith
8bdb682205
add missing period
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-03 09:51:09 -07:00
Vincent Demeester
63d65505b2
Update /node/*
api reference documentation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-03 14:55:30 +02:00
Sebastiaan van Stijn
5c9bcaa942
Merge pull request #25358 from lixiaobing10051267/masterBe
...
Remove reduntant word in device-mapper-driver.md
2016-08-03 10:21:39 +02:00
lixiaobing10051267
96c959ec6b
Remove reduntant word in device-mapper-driver.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-03 16:13:44 +08:00
Sebastiaan van Stijn
6e19e7b1d7
Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update
...
[Carry 24314] Make MongoDB sample Dockerfile working again
2016-08-03 01:27:26 +02:00
Maxim Fedchyshyn
60f4c7dac3
Make MongoDB sample Dockerfile working again
...
There were couple issues in the previous version of this Dockerfile
1. [MongoDB manual](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu/ ) uses 3.2 repo version as of July'16.
2. Command `# lsb_release -sc` doesn't work out of box, because of `bash: lsb_release: command not found`.
Signed-off-by: Maxim Fedchyshyn <sevmax@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-03 01:09:31 +02:00
Daniel X Moore
397cc85643
409 status code result to create service
...
Added example 409 status code result to the create service endpoint.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-08-03 00:46:04 +02:00