Misty Stanley-Jones
708a93a800
'docker node inspect <node> --pretty' needs an extra newline at the end
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 341489f150
2016-09-26 19:34:11 -07:00
Alessandro Boch
2be91b121b
Vendoring boltdb @fff57c100
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
(cherry picked from commit 5cfbdceafe
2016-09-26 19:34:04 -07:00
Yanqiang Miao
0dcd2e1a5d
Remove the support of setting host configuration options when the container starts
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
(cherry picked from commit 26b6b47420
2016-09-26 19:33:58 -07:00
Yong Tang
e892a54fa1
Fix incorrect help output in docker network ls
...
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```
This fix changes the help output to:
```
-q, --quiet Only display network IDs
```
This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`
This fix fixes 26312.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit b9e46235fa
2016-09-26 19:33:52 -07:00
Misty Stanley-Jones
24df982128
Clarify usage of --force when used on a swarm manager
...
Fixes #26125
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 7b5c3d935a
2016-09-26 19:33:45 -07:00
Liam Macgillavry
fd7e763e7c
missed DOCKER->DOCKERD change in 1ac1b78b3a for 'status'
...
Signed-off-by: Liam Macgillavry <liam@kumina.nl>
(cherry picked from commit 11eda60848
2016-09-26 19:33:36 -07:00
Christopher Jones
132a8e7963
ppc64le: remove go SHA check
...
Makes it consistent with other Dockerfiles.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
(cherry picked from commit d9e12cba5a
2016-09-26 19:33:30 -07:00
Michael Crosby
aaaeb84ac6
Check for non-nil container after match
...
There can be a race between getting the container ids for matches and
getting the actual container. This makes sure that we check that the
container returned by `Get` is non-nil before adding it to the list of
matches.
Fixes #25991
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit a020ec4c8b
2016-09-26 19:33:23 -07:00
Victor Vieux
667c02ce8c
Merge pull request #26765 from aaronlehmann/swarmkit-1.12.2
...
Vendor SwarmKit for 1.12.2
2016-09-26 13:05:52 -07:00
Victor Vieux
38aa258343
Merge pull request #26874 from mlaventure/1.12.2-vendor-containerd
...
Vendor in containerd
2016-09-26 12:55:57 -07:00
Kenfe-Mickael Laventure
727402135d
Vendor in containerd
...
This brings in the exec's children handling fixes
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-09-25 05:23:22 -07:00
Victor Vieux
03da508273
Merge pull request #26875 from justincormack/1.12.x-sierra-go
...
Patch Go with fix for OSX Sierra
2016-09-25 00:17:00 -07:00
Victor Vieux
e4040acb01
Merge pull request #26879 from mavenugo/ln_1.12.2
...
Vendoring libnetwork e282a91b294ab413a172b3c4e37d15fa92d79ef5
2016-09-25 00:10:50 -07:00
Jana Radhakrishnan
df3209b4d6
Add GetListenAddress in ClusterProvider
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-09-23 17:30:36 -07:00
Madhu Venugopal
0ce34bdb12
Vendoring libnetwork e282a91b294ab413a172b3c4e37d15fa92d79ef5
...
Carries a bunch of patches to resolve routing-mesh and swarm-mode
networking issues.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-09-23 17:26:40 -07:00
Justin Cormack
ef634b95f4
Patch Go with fix for OSX Sierra
...
Backport this patch to the Go 1.6.3 runtime needed for OSX Sierra.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-09-23 23:30:25 +01:00
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
07fcfd0c28
Merge pull request #26777 from vdemeester/1.12.x
...
Fixing Regression in exit codes in 1.12
2016-09-23 17:26:55 +02:00
Vincent Demeester
1bcc2d9ab7
Fixing Regression in exit codes in 1.12
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-09-21 20:43:02 +02: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
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 9e9ba1e1c1
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 6fafd07282
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 e41839e8a1
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 ae4582dc28
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 e6f76800f5
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 2cce7bf33a
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 061cc41759
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 027e7be348
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 daf454d8cd
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 e08b2f7a08
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
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 b98e918248
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 7baa09faa0
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 baf2108baf
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 01fe5639bc
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 1145c9b0d5
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 e96c0fafa0
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 6f0502b89b
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 4e4ebbe340
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 dd02815a26
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 0ebb18102f
2016-09-08 14:34:00 -07:00
