Tonis Tiigi
fea72090a7
Fix race on sending stdin close event
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 4e262f6387
2016-12-14 13:26:18 -08:00
Victor Vieux
58a51648bd
Merge pull request #29416 from aboch/c1.12.x
...
[1.12.5] Fix buildIpamResources()
2016-12-14 11:22:12 -08:00
Alessandro Boch
660154fafa
Fix buildIpamResources()
...
- Can no longer assume IPv6 operational data to be present
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-12-14 09:34:03 -08:00
Victor Vieux
02394deb34
Merge pull request #29379 from vieux/1.12.5-rc1_bump
...
1.12.5-rc1 bump
2016-12-13 22:27:18 -08:00
Victor Vieux
5fb9e4926a
Merge pull request #29377 from andrewhsu/require-docker-selinux
...
[1.12.x] depend on docker-selinux for centos-7.3+
2016-12-13 22:25:21 -08:00
Victor Vieux
f6fbe58fbe
add networking fox to changelog
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-12-13 20:08:39 -08:00
Victor Vieux
00ca3caed8
bump 1.12.5-rc1
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-12-13 17:31:18 -08:00
Andrew Hsu
f9bc32067d
only build selinux rpm if we have policy dir
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-13 17:01:48 -08:00
Andrew Hsu
c80d82a98d
change dep for docker-selinux in centos-7+
...
Use the policy files provided by CentOS for docker by depending on
docker-selinux.
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-12-13 17:01:48 -08:00
Victor Vieux
55d7080ee6
Merge pull request #29370 from cpuguy83/move_streamconfig_112
...
[1.12.x] Move `StreamConfig` out of `runconfig`
2016-12-13 16:47:51 -08:00
Brian Goff
286f44240c
Move StreamConfig out of runconfig
...
`StreamConfig` carries with it a dep on libcontainerd, which is used by
other projects, but libcontainerd doesn't compile on all platforms, so
move it to `github.com/docker/docker/container/stream`
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-12-13 16:57:21 -05:00
Vincent Demeester
0eb8e727af
Merge pull request #29332 from thaJeztah/docs-cherry-picks-1.12.4
...
[1.12.x] docs cherry picks
2016-12-13 12:20:56 +01:00
Victor Vieux
1564f02e33
Merge pull request #29338 from vieux/bump_1.12.4_version
...
bump version to 1.12.4
2016-12-12 15:00:06 -08:00
Victor Vieux
fbc5f05beb
bump version to 1.12.4
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-12-12 14:48:17 -08:00
Victor Vieux
1a184cf700
Merge pull request #29297 from vieux/plugins_cherry-picks
...
Make `docker pull` detect plugin content and error out.
2016-12-12 14:44:54 -08:00
Anusha Ragunathan
39fbd603e9
Make docker pull detect plugin content and error out.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 9b6dcc8b9d
2016-12-12 12:57:28 -08:00
Qinglan Peng
10b636ce03
fix some broken contents links
...
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>
fix-contents-links
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>
(cherry picked from commit bac792c163
2016-12-12 20:17:46 +01:00
Chris Gavin
b37fda12fb
Fix a spelling mistake in the docs.
...
Signed-off-by: Chris Gavin <chris@chrisgavin.me>
(cherry picked from commit 35c82f422d
2016-12-12 20:15:56 +01:00
Yanqiang Miao
63b4965387
Fix some format errors
...
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 71f1205269
2016-12-12 20:11:45 +01:00
Misty Stanley-Jones
1f6bda6d20
Document publishing a UDP port
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 2178c840ba
2016-12-12 20:11:25 +01:00
Misty Stanley-Jones
bf1a4d88bc
Fix copypaste error 'is-automated'
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 2333657e1b
2016-12-12 20:03:16 +01:00
lixiaobing10051267
60ff6c6b98
modify invalid url in plugins_network.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
(cherry picked from commit fc7c235f84
2016-12-12 20:01:35 +01:00
John Howard
c00b451d46
Windows: Note about volumes in run
...
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit b9e65f40cf
2016-12-12 20:01:35 +01:00
bbayani
bff68bc605
Clarify that ipmasq rules are not added when iptables is false
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit db3f06fd97
2016-12-12 20:01:34 +01:00
dattatrayakumbhar04
09b09c34b3
28600: Docs: network connect for container in Created/Stopped state
...
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
(cherry picked from commit 16c9cdad6f
2016-12-12 20:01:34 +01:00
Sean McIntyre
955c0bde09
Add HostConfig.Tmpfs to docs for container creation remote API
...
Signed-off-by: Sean McIntyre <s.mcintyre@xverba.ca>
(cherry picked from commit 2c38d43eb5
2016-12-12 20:01:34 +01:00
Leo Gallucci
a43b40b0d4
Typo --ti and missing my_strace_docker_image
...
Signed-off-by: Leo Gallucci <leo.gallucci@zalando.de>
(cherry picked from commit a5b69faafb
2016-12-12 20:01:34 +01:00
Sebastiaan van Stijn
ec8c61ee22
Update cURL example for cURL 7.40 differences
...
cURL 7.50 changed the validation for URL's
when using socket connections. cURL 7.4x
did not expect a hostname, whereas cURL
7.5x and above _requires_ a hostname.
See https://github.com/curl/curl/issues/936
This updates the example to take both
versions into account, because cURL 7.4x
is still widely used by distros.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2e0d6e6be2
2016-12-12 20:01:34 +01:00
Gerwim
9b63991d16
Update docker_remote_api.md
...
See https://github.com/docker/docker/issues/26099#issuecomment-245007539
Signed-off-by: Gerwim Feiken <g.feiken@tfe.nl>
(cherry picked from commit 587b186f85
2016-12-12 20:01:34 +01:00
Misty Stanley-Jones
6f3ad4cfc7
Rewrites to Developing Plugins topic
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit b39e65e937
2016-12-12 20:01:25 +01:00
Victor Vieux
fa791da12c
Merge pull request #29299 from andrewhsu/cherry-pick-release-deb
...
[1.12.x] cherry pick release deb
2016-12-12 10:47:03 -08:00
yuexiao-wang
1b01e2f1df
Update the subtitle for stack ps
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit 98fb1644c2
2016-12-12 19:10:55 +01:00
Akihiro Suda
fb0b19aa2e
update docs/reference/commandline/network_inspect.md
...
The following sentences (introduced in v1.11 via #21160 ) were misleading for Swarm mode services (>= v1.12)
For networks backed by multi-host network driver, such as Overlay,
this command also shows the container endpoints in other hosts in the
cluster. These endpoints are represented as "ep-{endpoint-id}" in the output.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 2c288e60db
2016-12-12 19:09:53 +01:00
Ding Fei
05f08f771e
Fix code block fences and typo.
...
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
(cherry picked from commit 08fe24c2d5
2016-12-12 19:09:44 +01:00
Ding Fei
46cc5c05aa
Fix typos in docs/reference/builder.md.
...
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
(cherry picked from commit 9ccb1f159e
2016-12-12 19:09:19 +01:00
Sebastiaan van Stijn
06b34e507d
Improve API format examples
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8e02b29d24
2016-12-12 19:09:08 +01:00
Sebastiaan van Stijn
554400b75b
Add KernelMemory to API changelog
...
Commit 9bd8a9b66bf988a9ce5e
2016-12-12 19:08:58 +01:00
Sebastiaan van Stijn
6d972ff0f7
Improve example for env vars in API docs
...
This was added in e41de3e631441c9411e3
2016-12-12 19:08:48 +01:00
Alicia Lauerman
39466e3144
add documentation for docker stack ps
...
also updates related stack docs and removes stack_tasks.md
Signed-off-by: Alicia Lauerman <allydevour@me.com>
(cherry picked from commit 970ab9a224
2016-12-12 19:07:57 +01:00
milindchawre
073515574d
Fixes #27095 : Removing registrytoken field from doc as it is deprecated by identitytoken field
...
Signed-off-by: milindchawre <milindchawre@gmail.com>
(cherry picked from commit 72dd684c88
2016-12-12 18:55:40 +01:00
Yong Tang
3707a30459
Update docs for node filter of docker service ps
...
As is specified in 26964, it is possible to specify
a filter based on the node name or node ID.
This fix updates the related docs for that.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit c326e0afe3
2016-12-12 18:55:03 +01:00
Sebastiaan van Stijn
5dab892618
docs: add missing IPAM options to API docs
...
Commit dd28ded711d69fce79f9
2016-12-12 18:48:36 +01:00
Derek McGowan
a3cadca8e5
Use sha512 when gpg signing builds
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-12-09 17:57:23 -08:00
Dieter Reuter
7679e0bdfc
Include distro name into .deb filename
...
Right now we do have a problem to store the .debs for raspbian-jessie and
debian-jessie distro version for armhf arch. Both .debs have the same filename
so we have to include the distro version, too.
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2016-12-09 17:57:19 -08:00
Victor Vieux
f29c255b2c
Merge pull request #29262 from tophj-ibm/update-1.12.x-go-bin
...
[1.12.x] ppc64le, use official go 1.6.4 binaries
2016-12-09 13:50:43 -08:00
Brian Goff
89da30c482
Merge pull request #29261 from andrewhsu/revert-pr-29188
...
Revert PR 29188 add selinux policy for centos-7 on 1.12.x branch
2016-12-08 20:36:33 -05:00
Christopher Jones
146400425e
[1.12.x] ppc64le, use official go 1.6.4 binaries
...
Use official go 1.6.4. binaries instead of downloading and building
from src
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-12-08 19:03:52 -05:00
Andrew Hsu
fe995bdfad
Revert "add selinux policy for centos-7"
...
This reverts commit 7e30cb6e52
2016-12-08 15:49:13 -08:00
Andrew Hsu
4b2b2c0af6
Revert "add extra docker.te lines from rhel7.3 docker.spec"
...
This reverts commit 5455138728
2016-12-08 15:49:09 -08:00
Andrew Hsu
85aa678ad8
Revert "get rhel7.3 selinux-policy-devel pkg for centos-7"
...
This reverts commit 97b6626138
2016-12-08 15:49:05 -08:00
