Commit Graph

22209 Commits

Author SHA1 Message Date
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
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
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
858159027f Merge pull request #21879 from WeiZhang555/fix-kill-nonexist
Fix bug that can't kill an restarting container
Upstream-commit: cb87b6eb6a955e5a66b17e0a15557f37f76b85c0
Component: engine
2016-04-13 22:50:19 -07:00
925ceebdbf Merge pull request #21970 from cpuguy83/use_cached_path_on_ls
Fix N+1 calling `Path()` on `volume ls`
Upstream-commit: 7cd420d63a708c7763bceff231873c4e73b29c31
Component: engine
2016-04-13 22:47:53 -07:00
f4871ac76e Fix panic on winsize syscall
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4d4ef98326f0b21bbb661321499e200a1412bc64
Component: engine
2016-04-13 17:08:00 -07:00
d823c21aaa Bump Go version to 1.5.4/1.6.1 (security fix) (#21978)
Go 1.6.1 is for ppc64le only.

https://groups.google.com/forum/#!msg/golang-announce/9eqIHqaWvck/kXsfO0ogLAAJ

Dockerfile.armhf cannot currently be updated.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 7268eb97bc208f4cdf7c9119da0cfa2c9ed558a4
Component: engine
2016-04-13 11:22:48 -07:00
05c398dfb7 Merge pull request #21953 from Microsoft/jjh/containerapipostcontainerstop
Windows: Fix deamon deadlock in docker stop
Upstream-commit: d954097c0b9e48010f980217167af6b40cf97e58
Component: engine
2016-04-13 13:28:59 -04:00
4447d74a76 Move build endpoint handler from daemon (#21972)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 73ac6d199cacbcdba4c062f982b31f8d57e03f3c
Component: engine
2016-04-13 10:21:00 -07:00
6761133f09 Windows: Fix Hyper-V container ACLs for TP5 (#21974)
In TP5, Hyper-V containers need all image files ACLed so that the virtual
machine process can access them. This was fixed post-TP5 in Windows, but
for TP5 we need to explicitly add these ACLs.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 6f8878872f8782d4300faeb80413c8c60f56cff1
Component: engine
2016-04-13 10:15:38 -07:00
a4980222b8 Graphdriver docs (#22003)
* Fix closing strings in graphdriver plugin documentation

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

* Fix documenation for Err type in graphdriver plugins

Fix https://github.com/docker/go-plugins-helpers/issues/24

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

* Add missing MountLabel argument in graphdriver plugin documentation

The real `Create` seems also to take more arguments (the `storageOpt`) which
are not exposed to the plugin API (yet?).

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

* Add missing CreateReadWrite in graphdriver plugin documentation

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
Upstream-commit: 44fe649c2ed6c1c6ba201086c1f83ec993ce9064
Component: engine
2016-04-13 10:11:39 -07:00
2a0b94972b Merge pull request #19265 from rhatdan/netsysctl
Add support for setting sysctls
Upstream-commit: 988508a2b5aa18c04fd3db143b4e4f5f207ea15e
Component: engine
2016-04-13 18:36:30 +02:00
5f0157b8da Merge pull request #21942 from tiborvass/fix-21808
vendor runc to fix issue#21808
Upstream-commit: 9333042ba140680e5693a89338a4619e16538d61
Component: engine
2016-04-13 08:24:20 -07:00
977c2f6a60 Fixes #21701 devicemapper docs
Copy edit the content
Updates to existing material
Adding mbentley's comments
Updating with last minute comments
Update with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 783ebebff40ebdae27dc72b4c8c5151a01220a87
Component: engine
2016-04-13 08:02:16 -07:00
df51bb2466 Merge pull request #21994 from thaJeztah/update-binary-installation
docs: update installation from binaries for 1.11
Upstream-commit: 1687f77db2892a3221cbafd46dc11e07ddcec438
Component: engine
2016-04-13 09:26:52 -04:00
35dbb56580 docs: update installation from binaries for 1.11
Binaries are now distributed as a '.tgz' or '.zip'
archive, and contain multiple binaries for Linux.

This updates the instructions for 1.11.

Also mention that the Windows 64-bit binary
actually can be used as a daemon. Given that
this is still in beta, no instructions were
added for *running* a daemon on Windows.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f5336c737086a4c1807bb2b6ab57116b5ed9d769
Component: engine
2016-04-13 15:26:03 +02:00
9a1f7c0972 Merge pull request #21885 from triccardi-systran/20612-improve-build-cache-miss-documentation
Improve build cache miss doc for `ARG` and `RUN`
Upstream-commit: edfe4e9fba89d0b8458e7e76132da2440c29ccbd
Component: engine
2016-04-13 15:23:14 +02:00
44c73694c8 Improve build cache miss doc for ARG and RUN
The documentation already says the cache miss happens only at `ARG`
variable usage, not declaration, but there is a very common implicit
usage: `RUN`, which this commit documents even more, improving on #21790.

Also, use `definition` instead of `declaration`: it's the same thing, and
`definition` is already used in this documentation, contrary to
`declaration`.

Also, distinguish between "instructions" and "variables defined by `ARG`
instructions".

Signed-off-by: Thomas Riccardi <riccardi@systran.fr>
Upstream-commit: 82f5ef2d2562f9e742eb694dc4b0a1f768a4f0de
Component: engine
2016-04-13 15:02:09 +02:00
c90d76ef8b Merge pull request #21965 from aboch/doc
Update /containers/create remote API docs
Upstream-commit: f5d3f528fd2edeb4acf857960698262777f410c5
Component: engine
2016-04-13 12:56:40 +02:00
da8ff9f6e7 Merge pull request #21959 from coolljt0725/fix_21957
Fix docker load progressbar, fixes #21957
Upstream-commit: 348d90276802aac6c76126f2fe6866c521190ecd
Component: engine
2016-04-13 00:31:27 -04:00
94711fe63a Fix docker load progressbar, fixes #21957
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 96d7db665b06cc0bbede22d818c69dc5f6921f66
Component: engine
2016-04-12 22:45:42 -04:00
7a5c745f9d Merge pull request #21949 from aaronlehmann/vendor-distribution-1622
Vendor distribution to correct config blob media type in schema2 manifest
Upstream-commit: 40502e381371763ea0942b7d6511f5c98b65bc1e
Component: engine
2016-04-12 21:23:22 -04:00
312476d137 Windows: Timeout TestContainerApiPostContainerStop
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d691b4af18ffbab68fb1aab3939e65b59c3e4c2a
Component: engine
2016-04-12 18:21:54 -07:00
56e19c6402 Merge pull request #21337 from yongtang/21247-TestRunAttachFailedNoLeak
Flaky test: TestRunAttachFailedNoLeak (#21247)
Upstream-commit: fa4fea32330c11b337873698c4a79244aabef4d2
Component: engine
2016-04-12 17:40:16 -07:00
1442a95a2d Fix N+1 calling Path() on volume ls
Implements a `CachedPath` function on the volume plugin adapter that we
call from the volume list function instead of `Path.
If a driver does not implement `CachedPath` it will just call `Path`.

Also makes sure we store the path on Mount and remove the path on
Unmount.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9e6b1852a78eda6ed2cb255d6be8a0d0e5a5ca40
Component: engine
2016-04-12 20:30:34 -04:00
2ba8d1600c Merge pull request #21962 from Microsoft/jjh/logssincefuturefollow
Windows: Disable flakey LogsSinceFutureFollow
Upstream-commit: f3dcc1c46249ffc4a73ab2005d1ad011dff3c7df
Component: engine
2016-04-12 15:07:51 -07:00
e1986078c7 Merge pull request #21897 from calavera/remove_authorization_refs_from_api
Move middleware to interfaces.
Upstream-commit: 9438572fc00f928ec83c884992d5492a7a68babb
Component: engine
2016-04-12 14:08:36 -07:00
13ff1eed5b Merge pull request #21714 from hallyn/2016-03-31/aufs.2
don't try to use aufs in a user namespace
Upstream-commit: 7c16063afaafaddf0b738fe9ad6221f55ee85a99
Component: engine
2016-04-12 14:07:51 -07:00
8becc1526b Update /containers/create remote API docs
- Show how to pass the networking config in POST containers/create body

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 30859c34569b900d3d798ad55f48f3d4fd7dc32c
Component: engine
2016-04-12 13:41:13 -07:00
c8bf9bd25d Windows: Fix flakey LogsSinceFutureFollow
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: acaef7caaf6078719d8e838efad0fb1b7ce153d8
Component: engine
2016-04-12 13:27:29 -07:00
ec5e265b2a vendor runc to fix issue#21808
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c3fe4226f3aec1c59f581e636aece9cefaa9a515
Component: engine
2016-04-12 15:35:43 -04:00
ac02172c8d Merge pull request #21903 from cyphar/reduce-dependencies-pkg-listeners
pkg: listeners: move Docker-specific semantics to docker/daemon*
Upstream-commit: b6a08c3f117c5507e41a1e19c7b44229522409b1
Component: engine
2016-04-12 12:04:03 -07:00