Commit Graph

21715 Commits

Author SHA1 Message Date
b6d708cfd3 Merge pull request #21443 from calavera/fix_network_path_issue
Fix network path issue
Upstream-commit: 68674f739f218a45419c33a0c25cb6cbfbd0f4af
Component: engine
2016-03-23 22:27:44 -04:00
c92d23eb40 Merge pull request #21430 from tophj-ibm/remove-seccomp-ppc64le
ppc64le: remove seccomp from Dockerfile
Upstream-commit: 3f568b19e80531e34a664fe4200987e7044f6b22
Component: engine
2016-03-23 16:36:29 -07:00
dacc1ae34c Merge pull request #21446 from cpuguy83/plugin_activation_issue
Fix panic in loading plugins
Upstream-commit: 82b9e60369d3d5d0dea1a10edc7c95b2bbe16685
Component: engine
2016-03-23 14:25:35 -07:00
3420db4b5e Fix panic in loading plugins
When a plugin is first found, it is loaded into the available plugins
even though it's not activated yet.
If activation fails it is taken out of the list.
While it is in the list, other callers may see it and try to check it's
manifest. If it is not fully activated yet, the manifest will be nil and
cause a panic.

This is especially problematic for drivers that are down and have not
been activated yet.

We could just not load the plugin into the available list until it's
fully active, however that will just cause multiple of the same plugin
to attemp to be loaded.

We could check if the manifest is nil and return early (instead of
panicing on a nil manifest), but this will cause a 2nd caller to receive
a response while the first caller is still waiting, which can be
awkward.

This change uses a condition variable to handle activation (instead of
sync.Once). If the plugin is not activated, callers will all wait until
it is activated and receive a broadcast from the condition variable
signaling that it's ok to proceed, in which case we'll check if their
was an error in activation and proceed accordingly.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: baac2f48674d42863f9fdca5ef3056b4c6ed707e
Component: engine
2016-03-23 15:34:15 -04:00
fec52ca66f Merge pull request #21437 from tiborvass/fix-hub-test
test: Do not check error message from hub, it is not needed
Upstream-commit: bc3b07e1159c4e9de29250f8af86accd740b6459
Component: engine
2016-03-23 12:24:16 -07:00
676dd1beed Fix Docker core dumps when removing network with special characters (#21401).
This fix tries to fix Docker core dumps when removing network with special
characters. The issue is from the fact that when docker client tries to
pass the command to API, the networkID is not escaped in case of special
characters. This also means other commands (not just `docker network rm`)
may face the same issue (e.g., `docker network connect`).

This fix adds the URL path escape to properly handle it. In addition, an
integration test for network create and delete is added to cover the cases
in #21401.

This fix fixes #21401.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit f8dc5562d0a74792c46b9382181ddf97e5d7cdac)
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f1542276081aa91396495059638d3ea30d4e5a10
Component: engine
2016-03-23 15:07:14 -04:00
345460db06 Vendor engine-api 0.3.1.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 58385bc8a51e538f64a0d91c3259f20c6c289c86
Component: engine
2016-03-23 15:05:19 -04:00
a0962dd1f2 Revert VERSION bump to 1.11.0-dev
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9fb41520af3210466062a5a779148d2b0b8e3914
Component: engine
2016-03-23 14:27:33 -04:00
dabb7c86ca test: Do not check error message from hub, it is not needed
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: bbdd34c370949a2db9f139720b4498bc0952e700
Component: engine
2016-03-23 14:11:44 -04:00
3b67d2aa50 Merge pull request #21431 from tiborvass/bump_apiversion_to_v1.24
Bump API Version to v1.24
Upstream-commit: 38227b96c08188931d38fcf08a048937b2d9da69
Component: engine
2016-03-23 13:08:23 -04:00
98304712b8 Merge pull request #21425 from tiborvass/fix-release-sh
Fix release.sh script
Upstream-commit: faf5645a62190e5482af09c537a40247f47b9e43
Component: engine
2016-03-23 10:02:59 -07:00
299638e996 Merge pull request #21176 from cyphar/fix-apparmor-profile-execpath
profiles: apparmor: remove unused fields
Upstream-commit: 1f40cc15c7776d40e743cc62bf9b1c1dd23ce86e
Component: engine
2016-03-23 10:02:34 -07:00
91408a7472 Bump API Version to v1.24
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 928ea1e957812c351b77bb33be7f3ef9fd629231
Component: engine
2016-03-23 12:26:23 -04:00
bdefe38d03 ppc64le: remove seccomp from Dockerfile
Removes the seccomp buildtag when building runc.
Because seccomp isn't currently being built, this would cause
the build to fail.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 2caf09d37b5865882dfa8c60d5362fd6d2ba54fd
Component: engine
2016-03-23 12:11:08 -04:00
661ca233b2 Fix release.sh script
Use aws instead of s3cmd.
Make sure the release script works with the docker-prepended binary
names.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: dd51e85c050076be09fc7414bda1f261b61e60ad
Component: engine
2016-03-23 11:59:21 -04:00
d1c6644a16 Merge pull request #21420 from icecrime/update_arm_build
Update Dockerfile.armhf
Upstream-commit: f4dfe15cbedd00668d1ad6fe26544cfb814f35ea
Component: engine
2016-03-23 16:27:53 +01:00
971b432393 Merge pull request #21386 from Microsoft/jjh/mountfix
Windows: Fix mountinfo
Upstream-commit: 6ad9def11a4cff5f2e45f756b3de28888fc584b9
Component: engine
2016-03-23 10:14:20 +01:00
e613ac99c7 Merge pull request #21413 from tiborvass/docker-prefix
Add `docker-` prefix to runc and containerd binaries
Upstream-commit: bc3149b75f26fec36fa91157bfd6103adaa13148
Component: engine
2016-03-23 03:58:59 -04:00
fba90c19ef Revert "Move layer mount refcounts to mountedLayer"
This reverts commit 563d0711f83952e561a0d7d5c48fef9810b4f010.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: e91de9fb9d175541acc95834de486d33feef552a
Component: engine
2016-03-23 00:33:02 -07:00
1981bd700f Merge pull request #21407 from LK4D4/log_stats_errors
daemon: log errors from stats calls
Upstream-commit: f668e36652e26f92c0f1a7fa3f648e5ed444b68e
Component: engine
2016-03-23 14:12:12 +08:00
ce07920e99 Add docker- prefix to runc and containerd binaries
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 009399dc8ed8a4b635b0e229bf07b685e286d8d9
Component: engine
2016-03-23 00:52:16 -04:00
730efa6a55 Merge pull request #21107 from cpuguy83/one_ctr_to_rule_them_all
Move layer mount refcounts to mountedLayer
Upstream-commit: 92a3ece35a10092af0944f175a15b2390f6c666e
Component: engine
2016-03-22 21:19:00 -07:00
fb774be576 Update Dockerfile.armhf
Use official Go 1.6 release, and update golang/tools and golang/lint
hashes accordingly.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 38d746462c7a883f4b56f0e68cda200e8d30024e
Component: engine
2016-03-22 20:19:39 -07:00
9e6a0a5df2 Merge pull request #21340 from SvenDowideit/workdir-does-a-mkdir-p
WORKDIR is like calling mkdir - but we've not told people
Upstream-commit: f26193e2cfa04e4fa37cebe62de07eb46e0efed7
Component: engine
2016-03-22 18:41:15 -07:00
644e539d29 Merge pull request #21381 from mlaventure/selinux-pcp_pmcd
Give selinux pcp_pmcd_t type access to /var/lib/docker
Upstream-commit: 55304e2e553c566d55efb01d609db381d34ec77d
Component: engine
2016-03-22 17:44:43 -07:00
7c90f8b43b Merge pull request #21370 from tonistiigi/expose-layer-ids
Expose RootFS in image inspect
Upstream-commit: 694b32df51ac82afdf4695569e87dad7eaf71de4
Component: engine
2016-03-22 20:33:18 -04:00
fbd88889d1 Merge pull request #21411 from mlaventure/fix-unauth-to-central
Update TestPushToCentralRegistryUnauthorized to match updated hub
Upstream-commit: 7bc052ae0449139bc0d6f2002c62cd849fb098bf
Component: engine
2016-03-22 20:31:10 -04:00
5b78a9f38b Merge pull request #21397 from kencochrane/update-release-script
Updated release.sh script to stop uploading binaries
Upstream-commit: d0d17a069371663b6ad60b0edb5d9beb5d9a175b
Component: engine
2016-03-22 20:29:16 -04:00
0436cacd63 Merge pull request #21406 from LK4D4/fix_streams_race
builder: synchronize stderr and stdout
Upstream-commit: fb1365639e7be8bb5e114de0b28e4a22c01530ee
Component: engine
2016-03-22 17:15:01 -07:00
e4e6a18b3d Merge pull request #21402 from crosbymichael/tar-binaries
Add containerd and runc binaries to tgz output
Upstream-commit: d02d48b4b19f327fdcfcc220f4c8154274b017f5
Component: engine
2016-03-22 17:11:34 -07:00
8d85f36ce3 Merge pull request #21410 from calavera/vendor_engine_api_v0.3.0
Vendor engine-api v0.3.0
Upstream-commit: 28af4789e6a183d3b684b9cf7f0061607a4e6a13
Component: engine
2016-03-22 16:41:10 -07:00
48cef14de6 Merge pull request #21367 from mlaventure/containerd-docs-cleanup
Remove unneeded references to execDriver
Upstream-commit: 3ce494f48cc37b1e4065b62e58ec1c0a5df0e00c
Component: engine
2016-03-22 19:40:27 -04:00
7429b9c336 Update TestPushToCentralRegistryUnauthorized to match updated hub
The error message was changed from "unauthorized: access to the
requested resource is not authorized" to "unauthorized: authentication
required".

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 37e2103e640861b02a1ea0253df749a527a87e1b
Component: engine
2016-03-22 16:15:29 -07:00
8c7ac04699 Export GOOS and GOARCH in subprocess for tgz
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5ff66748daecb9674b22983b84ac95c76e04ed00
Component: engine
2016-03-22 15:43:06 -07:00
0ce4c48e11 Vendor engine-api v0.3.0
I tagged the current commit so we have a better reference
of what's in this release.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9e9c73a52893e658e391dfc44d4cea38fa6af980
Component: engine
2016-03-22 18:12:16 -04:00
0ff9a3fc56 Merge pull request #21396 from aboch/vnn
Vendoring libnetwork v0.7.0-dev.10
Upstream-commit: 506fb9810c60177b360b9dabab516828b90ffc48
Component: engine
2016-03-22 15:09:42 -07:00
2e2ed4c31e Merge pull request #21303 from riyazdf/notary-vendor-docker1.11
vendor notary for docker1.11
Upstream-commit: 8b8fcb796f85bc8f5146fa61ce667699f0436591
Component: engine
2016-03-22 17:57:17 -04:00
11df489bb4 Merge pull request #21400 from LK4D4/fix_volumes_race
volume/local: fix race in List
Upstream-commit: 2ec1764d45de9269522cb084ec87c87dd6f3c4e0
Component: engine
2016-03-22 14:29:12 -07:00
66355ab0dd Merge pull request #21385 from tonistiigi/load-parent-chain
Add parent references support to load/save
Upstream-commit: acaec7f67cc67049182d162d2ac8ed7b5db90559
Component: engine
2016-03-22 14:07:06 -07:00
23e67168ca daemon: log errors from stats calls
I encountered silent errors ignoring when runc failed to parse pids.max

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 14e1325656257c9d96cd01c03e624c99cfc35d31
Component: engine
2016-03-22 14:03:47 -07:00
fd6a3ad797 builder: synchronize stderr and stdout
it's concurrent streams and should be synchronized before writing to response.
Otherwise there will be race in writing to *bufio.Writer in
net/http.response.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3eb0a80f29629a1c022dc914437b176271d476fc
Component: engine
2016-03-22 13:57:29 -07:00
296caafbd2 Expose RootFS in image inspect
Fixes #20451

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 14dc4a7158a141b5c13aa63231e467f0c3235850
Component: engine
2016-03-22 13:49:30 -07:00
26e4c9db49 Vendoring libnetwork v0.7.0-dev.10
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: fbdb3c3a4b15720c0df3a59d4bef0773b365c2b1
Component: engine
2016-03-22 12:36:21 -07:00
bf2f934743 Copy containerd binaries in tgz
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: aca7e73a69c13ec0e64cc60a9ebfeb92aca3d9a6
Component: engine
2016-03-22 12:23:17 -07:00
02220a45c4 Merge pull request #21270 from ehazlett/resource-labels
Add Label support for Images (build), Networks and Volumes on Creation
Upstream-commit: 53d2e5e9d754ce8fbef733759e9ec450514133e3
Component: engine
2016-03-22 15:12:33 -04:00
dbc8de7ddc Add function for copy containerd
This adds a function for copying containerd and other binaries as well
as adding a hash for those files.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 78568f2eb54a6455dad566923f3c6f03ac300405
Component: engine
2016-03-22 12:06:56 -07:00
f18bd98fd4 Merge pull request #21383 from estesp/shared-userns-net-ipc
Allow net and IPC namespaces to be shared when userns=on
Upstream-commit: 62d45566544344b6f562bff7792976702ed8938b
Component: engine
2016-03-22 11:40:12 -07:00
20a8382c82 vendor notary for docker1.11
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: ab3772f72fcb189c742510326069474ea625042f
Component: engine
2016-03-22 11:28:19 -07:00
efc6c29e8f volume/local: fix race in List
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3536c09ceaa2d94a43a3a3228b096ba7a61f558d
Component: engine
2016-03-22 11:21:38 -07:00
85da9b3aae Merge pull request #21223 from cpuguy83/add_nocp_to_vols
Add explicit flags for volume cp/no-cp
Upstream-commit: de9ff4bdc0e17a0fd455790972d83133f424ef9d
Component: engine
2016-03-22 13:45:12 -04:00