Commit Graph

25753 Commits

Author SHA1 Message Date
Aaron Lehmann 33e855f8ae Vendor swarmkit for 1.12.2
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-09-23 09:58:27 -07:00
Sebastiaan van Stijn e646e927ee Merge pull request #26707 from thaJeztah/revert-26320
[1.12.x] Revert "Merge pull request #26320 from yongtang/09052016-man-docker-c…
2016-09-21 19:49:06 +02:00
Sebastiaan van Stijn f885d8ed5c
Revert "Merge pull request #26320 from yongtang/09052016-man-docker-create"
This reverts commit f1d590c45b, which does
not apply to 1.12.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-21 19:48:43 +02:00
Sebastiaan van Stijn bb45417c91 Merge pull request #26603 from mstanleyjones/2016.09.13_cherry_picks
2016.09.13 cherry picks
2016-09-16 23:08:02 +02:00
Misty Stanley-Jones 4da24ca1e3 Set docker_remote_api_v1.25.md to draft in 1.12.x branch
It does not apply to 1.12.x but we are leaving the file in place
to make future cherry-picks easier.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:13 -07:00
Sebastiaan van Stijn 99ed95cb57 Merge pull request #26526 from lixiaobing10051267/masterSymble
fix some incorrect symbols before executing command
(cherry picked from commit 9e9ba1e1c1235c3bdb7a70a0a9d0c5932d5afe9e)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:13 -07:00
Justin Cormack 787ed27c32 Merge pull request #26496 from riyazdf/trust-sandbox-fix
Use latest version of notary server in trust sandbox docs
(cherry picked from commit 6fafd07282f950799613c2ffc8eac6ff86d48206)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Brian Goff 9ec857ad5a Merge pull request #26472 from yongtang/09112016-docker-build-step-0
Fix documentation for `Step 0` to `Step 1` in `docker build`
(cherry picked from commit e41839e8a154f1336b3a995dba3f5912dde7e0fe)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Sven Dowideit f784166e8a Merge pull request #26458 from sfsmithcha/fix_vip_diagram
updates swarm overlay network diagram
(cherry picked from commit ae4582dc28ba33f80f17e2cf47e62e464aac7ec5)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Vincent Demeester 0183b3bf8c Merge pull request #26426 from sfsmithcha/carry_pry_25414
Carry pr 25414
(cherry picked from commit e6f76800f5880652382a6f9180bfdefe6aaad577)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Sven Dowideit 8f264db3f1 Merge pull request #26306 from deployable/patch-1
Remote API documentation consistancy
(cherry picked from commit 2cce7bf33a1af566670ec0fb2deeff8056b2798d)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Michael Crosby b23bff1d9f Merge pull request #26224 from q384566678/test-zhou
Modify rename function use tips
(cherry picked from commit 061cc417591217c4bcf735267c2de18f2a8189c0)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-16 10:03:12 -07:00
Sebastiaan van Stijn 7c8dc9e6d5 Merge pull request #25817 from sfsmithcha/update_glossary
add swarm mode terms to the glossary
(cherry picked from commit 027e7be3482ff314f22dafcb7a4a2ab26b1a7ad7)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-14 09:48:29 -07:00
Vincent Demeester c6e7fececb Merge pull request #25719 from eskaaren/master
You can force leave swarm
(cherry picked from commit daf454d8cd6146ef2cb644614301806ef59c58cc)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-14 09:48:23 -07:00
Charles Smith 73f256760c Merge pull request #26549 from mstanleyjones/2016.09.13_cherry_picks
Merge pull request #26547 from londoncalling/fix-links-in-overview
2016-09-13 16:47:12 -07:00
Misty Stanley-Jones 01855d37be Merge pull request #26547 from londoncalling/fix-links-in-overview
fixed on-page links
(cherry picked from commit e08b2f7a082de21f62816ccbb42dedad36d47adb)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-13 16:34:32 -07:00
Brian Goff 9366ba2434 Merge pull request #26507 from drakenator/26384-healthcheck-race
Prevent stdout / stderr race condition in limitedBuffer
2016-09-12 18:57:55 -04:00
Stephen Drake 49dc97dbc2 Prevent stdout / stderr race condition in limitedBuffer.
Signed-off-by: Stephen Drake <stephen@xenolith.net>
2016-09-12 21:49:32 +02:00
Misty Stanley-Jones 7e9c951813 Merge pull request #26501 from mstanleyjones/revert_26455
Revert commit of #26236 to 1.12.x branch
2016-09-12 11:16:34 -07:00
Misty Stanley-Jones bf637439e7 Revert "Merge pull request #26236 from yuexiao-wang/remove-h-option"
This reverts commit eea99cd001.

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-12 11:02:09 -07:00
Sven Dowideit 2a1197037c Merge pull request #26455 from mstanleyjones/2016.09.09-docs-cherry-picks
2016.09.09 docs cherry picks
2016-09-12 09:45:49 +10:00
Antonio Murdaca 61c0a019fc Merge pull request #26264 from q384566678/test-two
Modify docker-restart.1.md
(cherry picked from commit b98e918248f4d4880b707e24bf2f72878ffbb8d6)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:45:22 -07:00
Vincent Demeester 2eb9e80547 Merge pull request #26252 from leslau/master
Fixed custom daemon options on systemd docs still using -H fd://
(cherry picked from commit 7baa09faa02ad93dcb0e103abde3c45862fc903c)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:45:14 -07:00
Vincent Demeester 4cf193bac5 Merge pull request #26242 from YuPengZTE/devEG
"eg." should be "e.g."
(cherry picked from commit baf2108baf8f4ff504847224cfb00794dfea5c20)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:45:07 -07:00
Vincent Demeester eea99cd001 Merge pull request #26236 from yuexiao-wang/remove-h-option
Remove -h option for docker cli
(cherry picked from commit 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:58 -07:00
Vincent Demeester d95bffff5f Merge pull request #26233 from yuexiao-wang/fix-readme
Fix readme doc for dockerd
(cherry picked from commit 1145c9b0d59dd1210e71799a68addee23884861b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:46 -07:00
Brian Goff 8a56561528 Merge pull request #26228 from lixiaobing10051267/masterPluginRm
check inconsistant command in docs/reference/commandline
(cherry picked from commit e96c0fafa0465e7d1a3a12fda820c16d0449f814)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:37 -07:00
Charles Smith dc98c76772 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
(cherry picked from commit 6f0502b89b29a7d23b02363d02104ec531a36e4a)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:29 -07:00
Vincent Demeester 9710d3d9e9 Merge pull request #25896 from raksonibs/fix/docs_step_6
Email deprecation for step 6 of tutorial
(cherry picked from commit 4e4ebbe34040f557775b59d111a8127f1f7df9a2)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:22 -07:00
yuexiao-wang 0d800e9a37 clean up the run.md in reference
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit dd02815a2673794cd94f3225c5517d9f30d09d56)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:09 -07:00
Sven Dowideit be71b62acf Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates
2016.09.08 engine docs updates
2016-09-09 21:43:38 +10:00
Vincent Demeester c63cdcd948 Merge pull request #26362 from lixiaobing10051267/masterIfconfig
rectify some response information while execute ifconfig in container
(cherry picked from commit 0ebb18102f376ee42ecc97d159842737ff73568d)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Vincent Demeester f1d590c45b Merge pull request #26320 from yongtang/09052016-man-docker-create
Update man page for `docker create` to add `--rm` flag
(cherry picked from commit d7594d23c81ad3de47bba933bb8f9041435a6226)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Charles Smith a8c297c254 Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker
Rewrites to Understanding Docker topic for clarity
(cherry picked from commit 426a0af0759798d8e3332b38236ee40df6d14798)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Sven Dowideit bf7d335513 Merge pull request #26218 from frosforever/fix_run_reference_typo
Correct typo in run reference docs that use the create command
(cherry picked from commit e73e37f11206a346d2a552c5d133112cd103d562)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Sven Dowideit 359f8fe426 Merge pull request #26343 from sfsmithcha/2016-09-06-1.12.1-engine-docs-updates
2016 09 06 1.12.1 engine docs updates
2016-09-07 22:15:21 +10:00
Vincent Demeester 11330bf048 Merge pull request #26307 from AkihiroSuda/fix-doc-26291
fix docs about `sudo docker login`
(cherry picked from commit da763602afbb25ea4428e1d608af5ee017a0b94e)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:31:59 -07:00
Vincent Demeester bbf49348e2 Merge pull request #26293 from lixiaobing10051267/masterDockerAttach
fix the wrong option info while specifying the command with the "--help"
(cherry picked from commit d8e151535017b4bb4ee5aa8281f1b9bb7bffa397)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:31:03 -07:00
Vincent Demeester 55f95dd7e8 Merge pull request #26292 from lixiaobing10051267/masterDockerPull
modify output info for docker pull centos
(cherry picked from commit 175188d8b0eb976cceb6c46de439186eec98e40e)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:30:10 -07:00
Vincent Demeester 95bc4519d2 Merge pull request #26241 from YuPengZTE/devNote
The first letter of “docker“ is small
(cherry picked from commit b14f29dfbd527fd2dbd05e024f760939aba6642c)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:28:39 -07:00
Vincent Demeester a42e2a0e42 Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
make command "docker plugin inspect" complete
(cherry picked from commit cf699ad427084076c7ca1ea5fbab78cd77597f2a)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:18:44 -07:00
Vincent Demeester 1e9fb2f18e Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
provide actual command format for docker network create
(cherry picked from commit 37fd1416daac0b3963dc812a820b844e9e854e59)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:17:10 -07:00
Vincent Demeester 5e4e13e31c Merge pull request #26187 from albers/docs-volume-create-fix
Fix argument order for docker create in tutorial
(cherry picked from commit 670eaa71a0629323327cb5604c44abf14890d4b4)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:15:08 -07:00
Vincent Demeester 748f3ef8e3 Merge pull request #26185 from yuexiao-wang/update-docs
Update description for docker plugin inspect
(cherry picked from commit 0414a2c1a960832cc6d3df8641f23952c3700084)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:11:34 -07:00
Doug Davis e3197e1dfa Merge pull request #26171 from CrimsonGlory/patch-2
typo
(cherry picked from commit 6705d68c8995137f94e2f0958c72e1502e682c88)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:09:20 -07:00
Michael Crosby 01de2e76b4 Merge pull request #26294 from petrsvihlik/updated-windows-mounting-example
Updated Windows mounting example
(cherry picked from commit 368a27a8d80337918d465c8c98100a4e22d9ef1a)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:06:44 -07:00
Sven Dowideit 1a57e1b1f5 Merge pull request #26314 from unclejack/docs_contiv_nfs
docs: mention NFS support for Contiv volume plugin
(cherry picked from commit 8f424f777438169edda354ab82fca9f81c7aab4a)
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:05:02 -07:00
Sven Dowideit 5c34d579dc Merge pull request #26302 from vdemeester/health_status-in-event-docs
Add health status as action on events documentations
(cherry picked from commit b468df9eac16d73c9b8e4853411df1fafea37d1f)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:04:23 -07:00
Charles Smith 931418603e Merge pull request #26288 from sfsmithcha/add_tls
author merge: addressed @diogomonica ' remark: add how pki works topic
(cherry picked from commit 75c36bcc64a5597919a16a7d43463f7e7c5e1499)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:03:44 -07:00
Vincent Demeester 7e2259bb63 Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
update docs/reference/commandline/service_create.md
(cherry picked from commit 1a04d7b1e13ffe725a5310b55e83ae60b1ab7e55)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:03:07 -07:00