b0280c37a0
Remove grpc logging to stderr
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-23 15:41:47 -07:00
82b9e60369
Merge pull request #21446 from cpuguy83/plugin_activation_issue
...
Fix panic in loading plugins
2016-03-23 14:25:35 -07:00
baac2f4867
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>
2016-03-23 15:34:15 -04:00
bc3b07e115
Merge pull request #21437 from tiborvass/fix-hub-test
...
test: Do not check error message from hub, it is not needed
2016-03-23 12:24:16 -07:00
5e502a1f1b
Merge pull request #21438 from tiborvass/do-not-stay-up-late
...
Revert VERSION bump to 1.11.0-dev
2016-03-23 11:31:00 -07:00
9fb41520af
Revert VERSION bump to 1.11.0-dev
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 14:27:33 -04:00
bbdd34c370
test: Do not check error message from hub, it is not needed
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 14:11:44 -04:00
38227b96c0
Merge pull request #21431 from tiborvass/bump_apiversion_to_v1.24
...
Bump API Version to v1.24
2016-03-23 13:08:23 -04:00
faf5645a62
Merge pull request #21425 from tiborvass/fix-release-sh
...
Fix release.sh script
2016-03-23 10:02:59 -07:00
1f40cc15c7
Merge pull request #21176 from cyphar/fix-apparmor-profile-execpath
...
profiles: apparmor: remove unused fields
2016-03-23 10:02:34 -07:00
928ea1e957
Bump API Version to v1.24
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 12:26:23 -04:00
dd51e85c05
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>
2016-03-23 11:59:21 -04:00
f4dfe15cbe
Merge pull request #21420 from icecrime/update_arm_build
...
Update Dockerfile.armhf
2016-03-23 16:27:53 +01:00
6ad9def11a
Merge pull request #21386 from Microsoft/jjh/mountfix
...
Windows: Fix mountinfo
2016-03-23 10:14:20 +01:00
bc3149b75f
Merge pull request #21413 from tiborvass/docker-prefix
...
Add `docker-` prefix to runc and containerd binaries
2016-03-23 03:58:59 -04:00
cb41c36108
Merge pull request #21424 from tonistiigi/revert-one_ctr_to_rule_them_all
...
Revert "Move layer mount refcounts to mountedLayer"
2016-03-23 03:41:58 -04:00
e91de9fb9d
Revert "Move layer mount refcounts to mountedLayer"
...
This reverts commit 563d0711f8
2016-03-23 00:33:02 -07:00
f668e36652
Merge pull request #21407 from LK4D4/log_stats_errors
...
daemon: log errors from stats calls
2016-03-23 14:12:12 +08:00
009399dc8e
Add `docker-` prefix to runc and containerd binaries
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 00:52:16 -04:00
92a3ece35a
Merge pull request #21107 from cpuguy83/one_ctr_to_rule_them_all
...
Move layer mount refcounts to mountedLayer
2016-03-22 21:19:00 -07:00
38d746462c
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>
2016-03-22 20:19:39 -07:00
f26193e2cf
Merge pull request #21340 from SvenDowideit/workdir-does-a-mkdir-p
...
WORKDIR is like calling mkdir - but we've not told people
2016-03-22 18:41:15 -07:00
55304e2e55
Merge pull request #21381 from mlaventure/selinux-pcp_pmcd
...
Give selinux pcp_pmcd_t type access to /var/lib/docker
2016-03-22 17:44:43 -07:00
694b32df51
Merge pull request #21370 from tonistiigi/expose-layer-ids
...
Expose RootFS in image inspect
2016-03-22 20:33:18 -04:00
7bc052ae04
Merge pull request #21411 from mlaventure/fix-unauth-to-central
...
Update TestPushToCentralRegistryUnauthorized to match updated hub
2016-03-22 20:31:10 -04:00
d0d17a0693
Merge pull request #21397 from kencochrane/update-release-script
...
Updated release.sh script to stop uploading binaries
2016-03-22 20:29:16 -04:00
fb1365639e
Merge pull request #21406 from LK4D4/fix_streams_race
...
builder: synchronize stderr and stdout
2016-03-22 17:15:01 -07:00
d02d48b4b1
Merge pull request #21402 from crosbymichael/tar-binaries
...
Add containerd and runc binaries to tgz output
2016-03-22 17:11:34 -07:00
28af4789e6
Merge pull request #21410 from calavera/vendor_engine_api_v0.3.0
...
Vendor engine-api v0.3.0
2016-03-22 16:41:10 -07:00
3ce494f48c
Merge pull request #21367 from mlaventure/containerd-docs-cleanup
...
Remove unneeded references to execDriver
2016-03-22 19:40:27 -04:00
37e2103e64
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>
2016-03-22 16:15:29 -07:00
5ff66748da
Export GOOS and GOARCH in subprocess for tgz
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-22 15:43:06 -07:00
9e9c73a528
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>
2016-03-22 18:12:16 -04:00
506fb9810c
Merge pull request #21396 from aboch/vnn
...
Vendoring libnetwork v0.7.0-dev.10
2016-03-22 15:09:42 -07:00
8b8fcb796f
Merge pull request #21303 from riyazdf/notary-vendor-docker1.11
...
vendor notary for docker1.11
2016-03-22 17:57:17 -04:00
2ec1764d45
Merge pull request #21400 from LK4D4/fix_volumes_race
...
volume/local: fix race in List
2016-03-22 14:29:12 -07:00
acaec7f67c
Merge pull request #21385 from tonistiigi/load-parent-chain
...
Add parent references support to load/save
2016-03-22 14:07:06 -07:00
14e1325656
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>
2016-03-22 14:03:47 -07:00
3eb0a80f29
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>
2016-03-22 13:57:29 -07:00
14dc4a7158
Expose RootFS in image inspect
...
Fixes #20451
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-22 13:49:30 -07:00
fbdb3c3a4b
Vendoring libnetwork v0.7.0-dev.10
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-22 12:36:21 -07:00
aca7e73a69
Copy containerd binaries in tgz
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-22 12:23:17 -07:00
53d2e5e9d7
Merge pull request #21270 from ehazlett/resource-labels
...
Add Label support for Images (build), Networks and Volumes on Creation
2016-03-22 15:12:33 -04:00
78568f2eb5
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>
2016-03-22 12:06:56 -07:00
62d4556654
Merge pull request #21383 from estesp/shared-userns-net-ipc
...
Allow net and IPC namespaces to be shared when userns=on
2016-03-22 11:40:12 -07:00
ab3772f72f
vendor notary for docker1.11
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-22 11:28:19 -07:00
3536c09cea
volume/local: fix race in List
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-22 11:21:38 -07:00
de9ff4bdc0
Merge pull request #21223 from cpuguy83/add_nocp_to_vols
...
Add explicit flags for volume cp/no-cp
2016-03-22 13:45:12 -04:00
5e3a8ef887
Updated release.sh script to stop uploading binaries
...
Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
2016-03-22 13:42:54 -04:00
0dcdd1c5b8
Merge pull request #21341 from duglin/tweakBuild
...
Add containerd/runc exes to bundle dir after build
2016-03-22 10:29:56 -07:00
Michael Crosby
David Calavera
Brian Goff
Arnaud Porterie
Tibor Vass
Tibor Vass
Jess Frazelle
Vincent Demeester
Tonis Tiigi
Lei Jitang
Sebastiaan van Stijn
Kenfe-Mickael Laventure
Alexander Morozov
Alessandro Boch
Riyaz Faizullabhoy
Ken Cochrane