1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
83e47c15ee Merge pull request #25573 from thaJeztah/improve-runmetrics-layout
docs: improve layout for runmetrics
(cherry picked from commit a19029a719f209f1bf2e760f11225027787550e2)
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-08-11 23:45:24 +00:00
Sebastiaan van Stijn
6811254691 Merge pull request #25588 from thaJeztah/fix-events-since-description
Fix events "since" query parameter description
(cherry picked from commit 960b7de456883864479428cdabb5189a348eb700)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md

(cherry picked from commit 006f50ae275775dd7125d5c54784fa782f87f37d)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:36:34 -07:00
Sven Dowideit
8cc5797894 Merge pull request #25569 from friism/fix-typo-in-security-doc
update intro to say there are four things to consider
(cherry picked from commit ce2ca236db87f8f580cb29be27b4f0b5341af0ca)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 7cee444f8b90d435cc3358e2f510d0614e4e02fd)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:36:34 -07:00
Sebastiaan van Stijn
7bd1512ad6 Merge pull request #25172 from vdemeester/25153-node-delete-update-api-docs
Add delete and update API documentation
(cherry picked from commit 2f167a760904f5cf4f6250a55aa8f735fba74594)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md

(cherry picked from commit ee59531352e3d98d4cc167733e0ffb99528dbd22)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:36:34 -07:00
Sebastiaan van Stijn
4e6e046035 Merge pull request #25532 from thaJeztah/docs-update-node-inspect-output
Update example output for node inspect
(cherry picked from commit 80c49d1e5206eabf314069c262f7f643adf021e1)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit adf552821a35361b5c975189d6fd5c26f700e86a)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:36:34 -07:00
Vincent Demeester
1ad0903ea3 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…
(cherry picked from commit 59b03240b17d5c1fdd18e629e614dc5cffc6c536)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Conflicts:
	docs/swarm/admin_guide.md

(cherry picked from commit 0f65b6b1377335cd343d248e3dc47d1ea75eb166)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:36:34 -07:00
Vincent Demeester
74e965afd8 Merge pull request #25458 from sfsmithcha/fix_swarm_update_typo
fix typo, change sample cert expiry value
(cherry picked from commit e62b9450136595ac73b4fd0de766d072c1a6954a)

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit f72a1eb6bed1684bb3f282227ae761c6e0532714)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:36:34 -07:00
Sebastiaan van Stijn
39d7e266de Merge pull request #25530 from thaJeztah/docs-update-image-load-response
docs: add missing "quiet" parameter for image/load and update response
(cherry picked from commit 06e3ea141707bc3a1d31a18c4768ed6bbf3976d4)
Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
2016-08-11 16:32:25 -07:00
Sebastiaan van Stijn
f558e71cd2 Merge pull request #25527 from thaJeztah/fix-image-load-api-docs
docs: add missing content-type header for image load
(cherry picked from commit 5fd483695f8d5ffa297f40730f21031f629333e7)
Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
2016-08-11 16:32:24 -07:00
Sebastiaan van Stijn
037ad1b174 Merge pull request #25506 from sfsmithcha/fix_network_name
fix overlay network example
(cherry picked from commit c51f639531459e57f681f97c7358c04a96785db0)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:24 -07:00
Sebastiaan van Stijn
33cabf2658 Merge pull request #25422 from sfsmithcha/fix_tutorial_advisory
update D4M D4W advisory in swarm tutorial
(cherry picked from commit e4bca493568c2b67bb45fc488cf7c8a81d55e3d3)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:23 -07:00
Sebastiaan van Stijn
c01379f52f Merge pull request #25441 from thaJeztah/sync-api-docs
Sync API docs to older API versions
(cherry picked from commit f4575970a7a9c052b2a45c1a9b66ba2333a4d824)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:23 -07:00
Sebastiaan van Stijn
d32508f2a1 Merge pull request #25435 from kfr2/fix-run-docs-typo
Fix typo in run command documentation
(cherry picked from commit 0af3ca6933cccae7fc12cd76dd2ec858bd469eb8)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:23 -07:00
Sebastiaan van Stijn
cfd105cd5b Merge pull request #25430 from padyx/doc_swarmjoin_conflictmarker
Remove git conflict markers in docs/reference/commandline/swarm_join.md
(cherry picked from commit 49819165460f12606cb96fc0e579cb4019e407da)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:22 -07:00
Sebastiaan van Stijn
4b9b07f281 Merge pull request #25425 from thaJeztah/remove-rc-suffix
Remove "-rc" from documentation
(cherry picked from commit 9513aa3a48b6d4d7d612ddbdc097495bf48d9572)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:22 -07:00
Sebastiaan van Stijn
fff3dce95f Merge pull request #25421 from avaid96/patch-1
minor nit typo in opensl(openssl) genrsa -out delegation.key 2048
(cherry picked from commit 4191b786c5a1741038561f79f7fb2790bcbd2b5a)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:21 -07:00
Sebastiaan van Stijn
bc967c6ea9 Merge pull request #25405 from thaJeztah/fix-api-markdown
Fix Markdown formatting in API docs
(cherry picked from commit 66671d4ec29d7ccbd991399b8b98705e57b6a3eb)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
2016-08-11 16:32:21 -07:00
Brian Goff
0faacf1180 Merge pull request #25399 from ilkka/swarm-tutorial-service-ps-output
Update `service ps` output format in swarm tutorial to match 1.12.0
(cherry picked from commit e1b77bd69a0789652252b5a1b338839541250dc1)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:20 -07:00
Brian Goff
8e04d5a68c Merge pull request #25376 from sfsmithcha/fix_typo
add missing period
(cherry picked from commit f7d48d74a3dd44171d5e9dbcf33ba6de40baa08a)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:20 -07:00
Sebastiaan van Stijn
222e44179c Merge pull request #25194 from vdemeester/23597-swarm-api-ref-fixes
Update `/node/*` api reference documentation
(cherry picked from commit 0ab06816ea5887098039ba4ddecc964654335594)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.24.md
	docs/reference/api/docker_remote_api_v1.25.md
2016-08-11 16:32:19 -07:00
Sebastiaan van Stijn
85b9530e26 Merge pull request #25358 from lixiaobing10051267/masterBe
Remove reduntant word in device-mapper-driver.md
(cherry picked from commit 5c9bcaa9421699eb39df59cf12f9404bd4ebec82)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:19 -07:00
Sebastiaan van Stijn
9aabd9c3f4 Merge pull request #24736 from johnharris85/fix-sinatra-tutorial
Fix broken gem instructions.
(cherry picked from commit 29648795cd3709063c0f4309148708bbb5a3e7bc)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:18 -07:00
Sebastiaan van Stijn
60db5f060e Merge pull request #25350 from thaJeztah/carry-24314-mongodb-example-update
[Carry 24314] Make MongoDB sample Dockerfile working again
(cherry picked from commit 6e19e7b1d715ac5be4b1a7932b42c5a7eb99a9ad)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:18 -07:00
Sebastiaan van Stijn
514c1da2bf Merge pull request #25349 from thaJeztah/carry-25174-api-docs-update
[carry 25174] 409 status code result to create service
(cherry picked from commit 2cb1281a4abe20f84cafa9d46f5660355e59ce44)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.24.md
	docs/reference/api/docker_remote_api_v1.25.md
2016-08-11 16:32:18 -07:00
Sebastiaan van Stijn
5cad6c1df8 Merge pull request #25318 from lixiaobing10051267/masterParentheses
A parenthesis omitted in Seccomp.md
(cherry picked from commit d7c9c85e3093cef9e014be12951d226ab45bbba6)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:17 -07:00
Sven Dowideit
d7a01cc60e Merge pull request #25282 from clhlc/clhlc-patch-1
Update swarm-mode.md
(cherry picked from commit 181f5ac6276fd47a81ea0931c4fd170ceb3508ed)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:17 -07:00
Sven Dowideit
7ab84e8daf Merge pull request #25241 from jhorwit2/jah/ps-doc-fix
Added shutdown to desired-state docs for filter node/service ps
(cherry picked from commit 1d8617a42b9e85f3098174234401d02595f84a79)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
2016-08-11 16:32:16 -07:00
Vincent Demeester
5f38d112fc Merge pull request #25269 from allencloud/update-remote-api-docs-about-409
add status code 409 in attach in docs
(cherry picked from commit 56cbfc587f3e30d7587a4a4969d5497aa07edc06)

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	docs/reference/api/docker_remote_api_v1.25.md
2016-08-11 16:32:16 -07:00
Tõnis Tiigi
a4c8fe1cd4 Merge pull request #25265 from adamwalz/docs_swarm_cluster_fault_tolerance
Fix swarm manager node fault tolerance table
(cherry picked from commit ceb4126aa0cfcaf7842d22351876dc35dff915b3)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:15 -07:00
Charles Smith
cdfde82612 Merge pull request #25205 from lixiaobing10051267/masterPath
Give the correct link of docker swarm init
(cherry picked from commit 93fea86d1da9088899481519412070e2207cfd40)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:15 -07:00
Vincent Demeester
e118034053 Merge pull request #25239 from dlech/patch-1
Make it clear which parmeter is the user
(cherry picked from commit c7fcf496af8f7f5a6f3ab5397857ecfe91cbc192)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:15 -07:00
Sebastiaan van Stijn
9c2ba289dd Merge pull request #25020 from jfrazelle/update-non-events
update security non-events
(cherry picked from commit 14664beda923dc9249cbd4ac4f024319668e57c0)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:14 -07:00
Charles Smith
5f3b3d651c Merge pull request #25182 from sfsmithcha/clarify_join_token
Author Merge add advertise address, clarify join token

CI errors expected.
(cherry picked from commit ee355e017d210bef02771a8de4733f820ae6b717)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:14 -07:00
Charles Smith
1a5acb35e7 Merge pull request #25197 from sfsmithcha/add_services_guide
author merge: add services guide to manage a swarm
(cherry picked from commit 8b69d50c79f75f670fdc87e3e19c651551726605)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:13 -07:00
Sven Dowideit
ddbc9c7d88 Merge pull request #25156 from londoncalling/docs-v112-getstarted-a
modifed d4mac and d4win download links to stable for v1.12
(cherry picked from commit 352c720d69f6c37c9b1e15332f46ea2dc4335cb9)

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-11 16:32:13 -07:00
Joao Fernandes
ee595f517b Fix typo in docs 2016-08-11 15:10:17 -07:00
Joao Fernandes
db523273c5 Update offline install docs 2016-08-11 14:22:17 -07:00
Joao Fernandes
72f799363d Add release notes for 2.0.3 2016-08-10 14:57:58 -07:00
Matt Bentley
a396b5cbd0 Added ports for HA documentation
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2016-08-10 14:18:34 -04:00
Joao Fernandes
f78b30d929 Merge pull request #2633 from vsaraswat/patch-1
Make DTR install on UCP node requirement clearer
2016-08-08 16:43:07 -07:00
Edgar Lee
d49c2ca9b5 Merge pull request #2606 from hinshun/improve-reconfigure-desc
Update reconfigure command description that only flags specified are …
2016-08-08 15:19:02 -07:00
Matt Bentley
67c7b2205d Fixed migrate command; added storage migration
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
2016-08-06 11:33:01 -04:00
Allen Sun
26811e6a09 Merge pull request #2407 from xianlubird/bug/schedule-log
Fix scheduler detail log improper effect when container name is empty
2016-08-06 11:05:21 +08:00
Vivek Saraswat
98e45b7ce8 Make DTR install on UCP node requirement clearer
During DockerCon workshops and other customer sessions several people have noted that it is not clear that DTR must be installed on a node already joined to the UCP cluster (they asked if it automatically joined the UCP cluster or not). Adding two lines (one in install and one in replica joins) that hopefully makes this clearer.
2016-08-05 16:58:41 -07:00
Dong Chen
c9d614ffe1 Listen to health_status events.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-08-05 13:48:25 -07:00
Edgar Lee
822dd43a54 Update reconfigure command description that only flags specified are changed and rest left intact 2016-08-03 18:13:56 -07:00
Dong Chen
1c0b72c4db Revert install-w-machine.md to 833471b74c.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-08-03 17:40:32 -07:00
Sven Dowideit
b9b87bed67 Merge pull request #83 from SvenDowideit/start-migrating-to-jenkinsfile
Initial Jenkinsfile
(cherry picked from commit 9736bd57db)
2016-08-03 21:27:27 +00:00
Riyaz Faizullabhoy
a6fda67663 Merge pull request #893 from docker/docs-typo
fix access typos, close 833
(cherry picked from commit 41c5dd3248dfeee0213b104b0cfc95b473164ec1)
2016-08-03 21:26:13 +00:00
Victoria
429320a4f8 Merge pull request #3797 from aanand/note-about-experimental-build
Add note to bundle docs about requiring an experimental Engine build
(cherry picked from commit 589fb4925e7620cf2631b491acc5e2df4f96b69c)
2016-08-03 21:15:48 +00:00