Commit Graph

22240 Commits

Author SHA1 Message Date
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
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
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
ec8db24ef5 Merge pull request #22060 from hqhq/hq_remove_tmp_code
Remove template code for runc and containerd
Upstream-commit: e9c231aea43ea863f5f332a409b82223efe5d8f3
Component: engine
2016-04-15 18:10:39 +02:00
ed92db4f93 Allow volume drivers to provide a Status field
The `Status` field is a `map[string]interface{}` which allows the driver to pass
back low-level details about the underlying volume.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 36a1c56cf555f8fe9ceabeebb8fc956e05863fc7
Component: engine
2016-04-15 10:56:38 -04:00
76b4a1f20d Mount volumes rprivate for archival and other use cases
People have reported following problem.

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

Once the cp operation is complete, it unmounted /dev/pts on the host. /dev/pts
is a submount of /dev/. This is completely unexpected. Following is the
reson for this behavior.

containerArchivePath() call mountVolumes() which goes through all the mounts
points of a container and mounts them in daemon mount namespace in
/var/lib/docker/devicemapper/mnt/<containerid>/rootfs dir. And once we have
extracted the data required, these are unmounted using UnmountVolumes().

Mounts are done using recursive bind (rbind). And these are unmounted using
lazy mount option on top level mount. (detachMounted()). That means if there
are submounts under top level mounts, these mount events will propagate and
they were "shared" mounts with host, it will unmount the submount on host
as well.

For example, try following.

- Prepare a parent and child mount point.
  $ mkdir /root/foo
  $ mount --bind /root/foo /root/foo 
  $ mount --make-rshared /root/foo
  
- Prepare a child mount 

  $ mkdir /root/foo/foo1
  $ mount --bind /root/foo/foo1 /root/foo/foo1
 
- Bind mount foo at bar

  $ mkdir /root/bar
  $ mount --rbind /root/foo /root/bar
  
- Now lazy unmount /root/bar and it will unmount /root/foo/foo1 as well.

  $ umount -l /root/bar

This is not unintended. We just wanted to unmount /root/bar and anything
underneath but did not have intentions of unmounting anything on source.

So far this was not a problem as docker daemon was running in a seprate
mount namespace where all propagation was "slave". That means any unmounts
in docker daemon namespace did not propagate to host namespace. 

But now we are running docker daemon in host namespace so that it is possible
to mount some volumes "shared" with container. So that if container mounts
something it propagates to host namespace as well. 

Given mountVolumes() seems to be doing only temporary mounts to read some
data, there does not seem to be a need to mount these shared/slave. Just
mount these private so that on unmount, nothing propagates and does not
have unintended consequences. 

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: cacd4007776672e918162936d8846eb51a5300e6
Component: engine
2016-04-15 14:03:11 +00:00
d95baeb192 Fix flaky test TestRunExitOnStdinClose
This test was flaky on ppc64le, where the average time to close was
around 1 second. This bumps that timeout to 60 seconds which should be
plently.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: f84cabd3b8a737e7539d71773b842daa8f0dc66b
Component: engine
2016-04-15 09:33:51 -04:00
1cc08f7023 Produce fatal error when running on kernel < 3.10.0
Running on kernel versions older than 3.10 has not been
supported for a while (as it's known to be unstable).

With the containerd integration, this has become more
apparent, because kernels < 3.4 don't support PR_SET_CHILD_SUBREAPER,
which is required for containerd-shim to run.

Change the previous "warning" to a "fatal" error, so
that we refuse to start.

There's still an escape-hatch for users by setting
"DOCKER_NOWARN_KERNEL_VERSION=1" so that they can
run "at their own risk".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 51b23d88422918c24291f5876df35f91b23a446a
Component: engine
2016-04-15 14:33:56 +02:00
a713f0b76d Fix security documentation, XSS -> CSRF
Signed-off-by: Thomas Grainger <tagrain@gmail.com>
Upstream-commit: ea8f9c972393e0929e643190573412410bf39c6a
Component: engine
2016-04-15 11:29:37 +01:00
4e9b36b9f3 Merge pull request #20924 from Microsoft/10662-CPUResourceControls
Add CPU count and maximum resource controls for Windows
Upstream-commit: 172ca1ca8c4d5157789feb97a6424104b81a3479
Component: engine
2016-04-15 08:14:59 +02:00
a91eed9e9d Remove template code for runc and containerd
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e67c758ec373745300317786a27d639082a3d18d
Component: engine
2016-04-15 12:45:35 +08:00
b1c3afb97e Fix build cache false positives when build context tar contains unnormalized paths
If a build context tar has path names of the form 'x/./y', they will be
stored in this unnormalized form internally by tarsum. When the builder
walks the untarred directory tree and queries hashes for each relative
path, it will query paths of the form 'x/y', and they will not be found.

To correct this, have tarsum normalize path names by calling Clean.

Add a test to detect this caching false positive.

Fixes #21715

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 8691a77e441996fef96019b94f299a11b7244080
Component: engine
2016-04-14 17:57:45 -07:00
b6c2e57eab Merge pull request #21172 from yongtang/20909-seccomp-in-docker-info
Show "seccomp" in docker info (#20909).
Upstream-commit: bc0c8828e9afc32f1660a1f679ed523376c7d3d2
Component: engine
2016-04-15 01:24:54 +02:00
de95cbad37 Get events until a time in the past.
This change allow to filter events that happened in the past
without waiting for future events. Example:

docker events --since -1h --until -30m

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 55053d3537100eaeaad9c83b43e31f22d14fde7b
Component: engine
2016-04-14 16:22:16 -07:00
22a06166b3 Add CPU count and maximum resource controls for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: ea8c690886970b2929d52d8b61dcfb8becc24db9
Component: engine
2016-04-14 15:40:25 -07:00
a6fa28fbfa Merge pull request #21634 from cpuguy83/add_beter_logging_for_TestDaemonNoSpaceleftOnDeviceError
More logs for `TestDaemonNoSpaceleftOnDeviceError`
Upstream-commit: 8011228b53ead375cf7645bf4e7f686324e6e9d6
Component: engine
2016-04-14 22:06:49 +02:00
ffa58e84f3 Merge pull request #21861 from jfrazelle/apparmor-examples-for-the-apparmor-gods
Add example to apparmor docs
Upstream-commit: 1a87a2105321e378ddfe0636869e4ee796174d3e
Component: engine
2016-04-14 21:48:02 +02:00
35f0c7b3c5 Merge pull request #22040 from thaJeztah/bump-version-to-v1.12.0-dev
Bump version to v1.12.0-dev
Upstream-commit: 18c386983174e6d0cafe77ed8d37a70d45ba964f
Component: engine
2016-04-14 15:29:07 -04:00
e7d2e352a6 Merge pull request #22022 from AkihiroSuda/fixunused
Clean up unused code
Upstream-commit: 9e4b5e06f0618a9feca3ab07b1b4a6c6fde05409
Component: engine
2016-04-14 12:21:47 -07:00
3b7a52e933 Add example to apparmor docs
Signed-off-by: Jess Frazelle <jess@mesosphere.com>
Upstream-commit: 80d63e2e112c75b1cc492ce52bdc0c61ef3c234c
Component: engine
2016-04-14 10:59:47 -07:00
bb8db185ff Merge pull request #22047 from ncopa/fix-build-from-tarball
Fix detection of git commit during build from tarball
Upstream-commit: 6472a6d9e56bcbd32642d69bf91d3a2831b09e9c
Component: engine
2016-04-14 10:42:45 -07:00
b52fc9cf74 Merge pull request #22038 from thaJeztah/cherry-pick-changelog
Update changelog in master
Upstream-commit: 51be6c4f189643b00e7d49a78278e985b3a93e88
Component: engine
2016-04-14 12:04:40 -04:00
7e728fb00f Fix detection of git commit during build from tarball
Distro packagers will often use the tarball to build a package and have
the build script for the package in git. To avoid that the docker build
script picks up the git commit from the distro repo we also check for a
directory named .git before check for -unsupported builds.

Signed-off-by: Natanael Copa <natanael.copa@docker.com>
Upstream-commit: 355ad33087c1c683458b60a6bc9e1f89623ee275
Component: engine
2016-04-14 17:30:18 +02:00
06666cda9a Move volume filters to API 1.24 docs
This feature was added after the 1.11 code-freeze,
so will be part of the 1.12 release. Moving it to the
right API version.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8ef76f779d6ea59cb1a8c6fde52e4d719a8c073a
Component: engine
2016-04-14 17:12:28 +02:00
161a23e2b3 Bump version to v1.12.0-dev
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7429a740cd9a83613cb6af4d4f2bf7f7538d9584
Component: engine
2016-04-14 15:22:18 +02:00
4e4a914f17 closes #11703 closes #11560
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
Upstream-commit: 297d6c04a31f39ff24fcebad8d82c43e0bcf6900
Component: engine
2016-04-14 15:21:07 +02:00
7d0f5dbc51 Fix some CHANGELOG entries
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 2535db86781f2731024c945ecabd59199de0c727)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6cc2bad7f4acd6d0f3be996c38f8d3dbb349421b
Component: engine
2016-04-14 15:15:23 +02:00
ebac4ccd4b Update Networking changelog for 1.11
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
(cherry picked from commit 2153d9ec9d32b882be929a79997c326d516fc44a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 17bce424d6e4356d0102dad55b9a0f7f03a64528
Component: engine
2016-04-14 15:15:09 +02:00
57d617dda1 Minor fixes to changelog
Some fixes in the changelog were not regressions
since 1.10.x, but only present in 1.11 release candidates
so don't need to be mentioned for the release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 99589731ac1e5d901436e6d0d8c03e9eddb5cccc)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d53e136a2bed649be245ce3a3d59faa344a2a755
Component: engine
2016-04-14 15:14:53 +02:00
777a396efd Update CHANGELOG.md
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c774c390b199ef59079cd1dc95260d1672625e50)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bcb7649c3c44eff93ca659a12790b369023a5d97
Component: engine
2016-04-14 15:14:40 +02:00
15f7d28528 Update CHANGELOG.md
hardware signing was put back to experimental due to packaging issues
(https://github.com/docker/docker/pull/21499)

add missing "--quiet" option for docker load

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 32a5308237858cc5b7bcac16cc16286fc7996a9b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b7f9856a3667491e7e054033a8a4cdf9c6abdf7c
Component: engine
2016-04-14 15:14:23 +02:00
6b417d323a Verify binaries in changelog
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit 76489af40f40385b3fd9f0a669fdc8cf3640e188)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 932e58631426b56939f7bf856c245446c41299eb
Component: engine
2016-04-14 15:14:05 +02:00
f180665b86 Add initial changelog for 1.11.0
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit e651c1b2b92ccfcf3b075999e2427773a9b3dbdf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9f3f96220d4243bad86e40b2d3f9283ce46bef85
Component: engine
2016-04-14 15:13:47 +02:00
c47b0699eb Clean up unused code
Signed-off-by: Akihiro Suda <suda.kyoto@gmail.com>
Upstream-commit: d231260868507174d60ff58b18b14fa5bc2d5b66
Component: engine
2016-04-14 07:04:10 +00:00