Commit Graph

22276 Commits

Author SHA1 Message Date
089a9530bf Merge pull request #22121 from tonistiigi/fix-exec-cleanup
Clean up exec fifos on process exit
Upstream-commit: 2f7df8e5dec7c4ab121d0ea0d337b5cc4c3d5c77
Component: engine
2016-04-19 09:45:54 -07:00
f2f56b9e01 Add the NetApp Docker Volume Plugin to the documentation
Signed-off-by: Jared Hocutt <jaredh@netapp.com>
Upstream-commit: f310fd14a9a99362635198cd5b1517a053813c92
Component: engine
2016-04-19 11:30:39 -04:00
c026bc562f Merge pull request #21901 from mavenugo/sid
Add container's short-id as default network alias
Upstream-commit: 8adc8c3a686be09212a894cc91dcd974b830f330
Component: engine
2016-04-19 08:16:41 -04:00
dbfba75d3e Merge pull request #22122 from Microsoft/jjh/defaultdir
Windows: Set default directory
Upstream-commit: 42a7efd69171e94063f0be2b1ad88262ee6bad81
Component: engine
2016-04-19 07:27:13 -04:00
888a7f4130 Docs: Container creation param descriptions not under HostConfig
This fix tries to fix issues mentioned in #22100 for incorrect
description of remote API's container creation params.

Several issues have been fixed:
1. CPU and memory related params (e.g., `MemorySwap`, `CpuShares`, etc.)
were incorrectly placed under the top level instead of under the HostConfig.
(v1.18-v1.24)
2. The param `Cpuset` has been deprecated but was never removed.
(v1.18-v1.24)
3. The param `PidsLimit` was not added even though the description
has been added.
(v1.23-v1.24)

This fix fixes #22100

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 332e3b545b0c0e825364c0f09315f82546c791f0
Component: engine
2016-04-18 21:15:33 -07:00
f8a8c81f4e Merge pull request #21657 from vdemeester/update-engine-api
Update engine api with required arguments
Upstream-commit: 7fd53f7c711474791ce4292326e0b1dc7d4d6b0f
Component: engine
2016-04-18 19:47:22 -07:00
3c7ba98def Merge pull request #22130 from Microsoft/jstarks/win_pidfile
Windows: don't overwrite PID file if process exists
Upstream-commit: aeb1e45e60b49dc2208a9857dce1867d2191bd16
Component: engine
2016-04-18 19:45:18 -07:00
b02df70f6f Windows: don't overwrite PID file if process exists
pidfile.New() was opening a file in /proc to determine if the owning
process still exists. Use syscall.OpenProcess() on Windows instead.

Other OSes may also need to be updated here.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 9e5b93565c8a10f4b06d2bcf61305fdfb7128628
Component: engine
2016-04-18 16:41:37 -07:00
a55432da08 Merge pull request #22120 from crosbymichael/stats-panic
Create a copy of stats value before modifications
Upstream-commit: eed9c930b85ac1489129e4e36e0945bb3ee6954f
Component: engine
2016-04-18 16:26:23 -07:00
430ab207ac Windows: Set default directory
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c2d183426ba2fb4e850dc006d3ad3cc3bd86cc24
Component: engine
2016-04-18 15:59:41 -07:00
0ed3dd83e3 Merge pull request #22080 from amitkris/pkg_term_solaris
Get pkg/term to build for Solaris
Upstream-commit: 2b5512a3be52424583adada7206107f65ff8fd18
Component: engine
2016-04-18 15:04:24 -07:00
487a876338 Merge pull request #22069 from rhvgoyal/overlay-private
Make overlay home dir Private mount
Upstream-commit: 7f767d8ff5c23979042dfd66db8e9487ee8f7eb8
Component: engine
2016-04-18 14:56:34 -07:00
f3325d63fe Make overlay home dir Private mount
People have reported following issue with overlay

$ docker run -ti --name=foo -v /dev/:/dev fedora bash
$ docker cp foo:/bin/bash /tmp
$ exit container

Upon container exit, /dev/pts gets unmounted too. This happens because
docker cp volume mounts get propagated to /run/docker/libcontainer/....
and when container exits, it must be tearing down mount point under
/run/docker/libcontainerd/... and as these are "shared" mounts it
propagates events to /dev/pts and it gets unmounted too.

One way to solve this problem is to make sure "docker cp" volume mounts
don't become visible under /run/docker/libcontainerd/..

Here are more details of what is actually happening.

Make overlay home directory (/var/lib/docker/overlay) private mount when
docker starts and unmount it when docker stops. Following is the reason
to do it.

In fedora and some other distributions / is "shared". That means when
docker creates a container and mounts it root in /var/lib/docker/overlay/...
that mount point is "shared".

Looks like after that containerd/runc bind mounts that rootfs into
/runc/docker/libcontainerd/container-id/rootfs. And this puts both source
and destination mounts points in shared group and they both are setup
to propagate mount events to each other.

Later when "docker cp" is run it sets up container volumes under
/var/lib/dokcer/overlay/container-id/... And all these mounts propagate
to /runc/docker/libcontainerd/... Now mountVolumes() makes these new
mount points private but by that time propagation already has happened
and private only takes affect when unmount happens.

So to stop this propagation of volumes by docker cp, make
/var/lib/docker/overlay a private mount point. That means when a container
rootfs is created, that mount point will be private too (it will inherit
property from parent). And that means when bind mount happens in /runc/
dir, overlay mount point will not propagate mounts to /runc/.

Other graphdrivers like devicemapper are already doing it and they don't
face this issue.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: e076bccb458aeadab9380ce0636456ad6317a85f
Component: engine
2016-04-18 21:48:09 +00:00
7e0d42a8a5 Add container's short-id as default network alias
link feature in docker0 bridge by default provides short-id as a
container alias. With built-in SD feature, providing a container
short-id as a network alias will fill that gap.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ea531f061d3c511e376753f9863cb41f1b96d87e
Component: engine
2016-04-18 14:45:16 -07:00
b394d53e14 Clean up exec fifos on process exit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 84d170129a19855829d282e5416ce08ddb2edbd6
Component: engine
2016-04-18 14:03:37 -07:00
4ea62ef8f4 Merge pull request #22029 from talex5/gitcommit
Build: pass through DOCKER_GITCOMMIT
Upstream-commit: c3533d58c36835c9560e859f09f15dbce82c3ac1
Component: engine
2016-04-18 12:46:09 -07:00
51b831f818 Merge pull request #22082 from tiborvass/revert-go-security-fix-for-windows
Workaround Windows bug discovered with Go security fix
Upstream-commit: 1cd7dd89175bea9a89c433093180e5aa3c8f04b3
Component: engine
2016-04-18 12:44:13 -07:00
c341b1945f Merge pull request #22088 from amitkris/update_fsnotify
Update fsnotify to v1.2.11
Upstream-commit: 2b6d7f728e163a82b3114c819bc7785ad22b5756
Component: engine
2016-04-18 12:38:29 -07:00
8cd702acc5 Merge pull request #22065 from thaJeztah/remove-deprecation-message
Remove deprecation warning
Upstream-commit: 4e898ae64be25bc5a86e0e7865a37b9f596e4d17
Component: engine
2016-04-18 15:29:05 -04:00
b8faf44733 Create a copy of stats value before modifications
Fixes #22030

Because the publisher uses this same value to all the
stats endpoints we need to make a copy of this as soon as we get it so
that we can make our modifications without it affecting others.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: d17ee4b506af842b2d9fe6f8736b4636e32db599
Component: engine
2016-04-18 11:41:38 -07:00
93eb6e71f1 Merge pull request #21993 from coolljt0725/quiet_restartmanger_cancel
Don't throw "restartmanager canceled" error for no restart policy container
Upstream-commit: a4030787f537e79242888cc3fd8b5f3f51ce357f
Component: engine
2016-04-18 14:38:01 -04:00
f54f89a21b Merge pull request #22058 from WeiZhang555/remove-rpc-error
Remove rpc error when shut down daemon
Upstream-commit: dadc3087e3442fec543822e9cf87145d3507930e
Component: engine
2016-04-18 20:25:14 +02:00
d32fb564d6 Merge pull request #22048 from thaJeztah/docs-update-api-for-labels
docs: update API for features added in 1.11
Upstream-commit: ac7e011ec90b110e62aafd3a1b2963634c9976a3
Component: engine
2016-04-18 18:21:38 +02:00
53859297b1 Merge pull request #22086 from aboch/doc
Clarify container external connectivity in multi-network scenario
Upstream-commit: e764e0215e11da40a1e2148efc9867be362bd2d4
Component: engine
2016-04-18 18:16:51 +02:00
27c9033293 doc: fix typo
Signed-off-by: yorkie <yorkiefixer@gmail.com>
Upstream-commit: d2c5bf23f16a98ca6f603f7fe2b5a31c70d4c8db
Component: engine
2016-04-18 23:42:33 +08:00
74a010ee39 Clarify container external connectivity in multi-network scenario
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: c2e088e13488904a6747809a689eac5d72a4618e
Component: engine
2016-04-18 08:39:40 -07:00
2ee66201b7 Merge pull request #22098 from thaJeztah/cherry-pick-21998
cherry-pick "runc install path changed from /usr/local/bin to /usr/local/sbin"
Upstream-commit: 9b6c055f920b596ba487e4ce0a9bb5f7d8df393d
Component: engine
2016-04-18 11:09:55 +02:00
0299648cee Vendoring libnetwork v0.8.0-dev.1
- Fixes docker/docker#16964
- Added maximum egress bandwidth qos for Windows

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b1459f1b94ee94240793f769a04354705e889104
Component: engine
2016-04-17 11:17:48 -07:00
c22673b199 runc install path changed from /usr/local/bin to /usr/local/sbin
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 3d85e51ef4284f572cb658cfe69edc92ac3a53bb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cbb6c6e959e48182f31b15046f5024572980af96
Component: engine
2016-04-17 01:36:53 +02:00
6e845df96b Merge pull request #22085 from thaJeztah/remove-unused-query-parameter
docs: remove unused "registry" parameter
Upstream-commit: 2a95488f7843a773de2b541a47d9b971a635bfff
Component: engine
2016-04-16 17:39:04 +02:00
59ebbd5d31 Merge pull request #21817 from tkopczynski/20784-builder-dockerfile-support
Unit tests for builder/dockerfile/support
Upstream-commit: 27dd6a10b8515ed464e11ba409dd8c03b2287d1d
Component: engine
2016-04-16 13:34:35 +02:00
145eac88d4 Merge pull request #20835 from cpuguy83/handle_stats_client_errors
Do not remove containers from stats list on err
Upstream-commit: 5314296c693d0d4d7f622940b48bc15e400032e3
Component: engine
2016-04-16 10:20:58 +01:00
f63a31e0b9 Remove rpc error when shut down daemon
RPC connection closing error will be reported every time we shutdown
daemon, this error is expected, so we should remove this error to avoid
confusion to user.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: a02ae66d361464cc24bec4fb6aa5778c9d5b8cda
Component: engine
2016-04-16 16:53:33 +08:00
5b28011fe3 Update fsnotify to v1.2.11
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: ae75a7d3b22c619d526568dcaca7582f03214411
Component: engine
2016-04-15 18:40:07 -07:00
2a1e2c7de1 Workaround Windows bug discovered with Go security fix
For context: https://github.com/golang/go/issues/15286

This commit downloads go1.5.3 in addition to go1.5.4 in order to
workaround the issue.

It is not expected to do a Docker release without a proper fix, however
this should help unblock Docker development on Windows TP5.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3b3e58b639729e0fb3227e21367fea3ff9c5ff03
Component: engine
2016-04-15 21:00:45 -04:00
3fe83c23f0 docs: update API for features added in 1.11
Docker 1.11 added a feature to set labels on volumes,
networks and images (during build), but these changes
were not documented in the API documentation.

This adds the new features to the documentation.

Also fixes some minor formatting, and options that
were not used in the examples.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ba353f37870fdeb8b875a79e1aec54dc3d1aedc4
Component: engine
2016-04-16 02:27:52 +02:00
e5a1aebe66 docs: remove unused "registry" parameter
The "registry" query-param was in added 10c0e990371e065d4fc1c9b680f03a46e5bacc5e,
and removed in docker 0.5.0 via 66a9d06d9fa7a382c6852cf047e1448e0d3e1782.

Aparently, it was never removed from the documentation,
and included in all versions of the API docs.

This removes it from the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e035a86c1d981d5e2ade303a9152ee36125a4cb9
Component: engine
2016-04-16 02:09:58 +02:00
870f41bf45 Unit tests for builder/dockerfile/support
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: d0ebc58b9c82d2baf0c672b514ba9733ff79a3a1
Component: engine
2016-04-16 00:19:58 +02:00
45616510e1 Get pkg/term to build for Solaris
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: b216dc9115ebc0b803551ff761f5464fcbde09e1
Component: engine
2016-04-15 14:18:26 -07:00
f32c486767 Merge pull request #22078 from yongtang/04152016-docs-remote-api-SecurityOpt
Fix incorrect docs in remote API for the option of `SecurityOpt`
Upstream-commit: 7bfa122472d9d693585bfa4af2c892678fdc3886
Component: engine
2016-04-15 15:47:50 -04:00
8d9f1bcb22 Merge pull request #21939 from calavera/events_until_past
Get events until a time in the past.
Upstream-commit: 19a453e6b40177af31703f107131aae5ca81adf2
Component: engine
2016-04-15 15:33:41 -04:00
4fabd4289c Merge pull request #22079 from allencloud/fix-typos-in-CHANGELOG
fix typos in changelog
Upstream-commit: 714cd6bd8f7756a8d7e2d24cc146b7b7d52618e2
Component: engine
2016-04-15 11:42:03 -07:00
4ccce743db Merge pull request #22066 from thaJeztah/fail-on-unsupported-kernels
Produce fatal error when running on kernel < 3.10.0
Upstream-commit: caf21c81ff91d48178f2616d1f5bd9c6df716b4c
Component: engine
2016-04-15 11:41:31 -07:00
fd94a4f966 fix typos in changelog
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 57f29f24e46c845ebbd6d309a3ca5af39ee0f3ec
Component: engine
2016-04-16 02:19:15 +08:00
0358d67fc6 Fix incorrect docs in remote API for the option of SecurityOpt
This fix tries to fix the issue in remote API docs for v1.15 (Docker 1.3.x)
and v1.16 (Docker 1.4.x) where `SecurityOpts` was used but the actual field
should be `SecurityOpt`.

This `SecurityOpt` field is verified through the source code in
v1.3.0 and v1.4.0:
https://github.com/docker/docker/blob/v1.3.0/runconfig/config.go#L35
https://github.com/docker/docker/blob/v1.4.0/runconfig/hostconfig.go#L98

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f3f981624bc9329740e9a1c52e71471ca38d8171
Component: engine
2016-04-15 11:08:15 -07:00
df2eec1c61 Merge pull request #22050 from tophj-ibm/increase-timeout-stdin-close-test
Fix flaky test TestRunExitOnStdinClose
Upstream-commit: d2851cc7e313aa3a56591b69ccc952bbfab0d0f7
Component: engine
2016-04-15 10:46:31 -07:00
c6ef103dcf Merge pull request #22009 from rhvgoyal/docker-cp-fix
Mount volumes rprivate for archival and other use cases
Upstream-commit: a1968615176001904e58300339df8f6d7b9b7086
Component: engine
2016-04-15 10:11:33 -07:00
23c1fd9d95 Merge pull request #21006 from cpuguy83/volume_inspect_meta
Allow volume drivers to provide a `Status` field
Upstream-commit: e40e5b97c1ad540aa0be568467546f27932ef3a5
Component: engine
2016-04-15 18:53:39 +02:00
16e418c586 Merge pull request #21633 from tkopczynski/20784-builder-tarsum-tests
Builder/tarsum unit tests
Upstream-commit: c60c3045ddf719a8e486e9f1bf69c634a05724b9
Component: engine
2016-04-15 12:53:07 -04:00
a683195dbd Merge pull request #21726 from aaronlehmann/tarsum-filename-normalization
Fix build cache false positives when build context tar contains unnormalized paths
Upstream-commit: 1a14bbc61e35fd2ca412e07fa6c456095756f892
Component: engine
2016-04-15 09:45:26 -07:00