Michael Crosby
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
David Calavera
faf5645a62
Merge pull request #21425 from tiborvass/fix-release-sh
...
Fix release.sh script
2016-03-23 10:02:59 -07:00
Jess Frazelle
1f40cc15c7
Merge pull request #21176 from cyphar/fix-apparmor-profile-execpath
...
profiles: apparmor: remove unused fields
2016-03-23 10:02:34 -07:00
Tibor Vass
928ea1e957
Bump API Version to v1.24
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-03-23 12:26:23 -04:00
Christopher Jones
2caf09d37b
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>
2016-03-23 12:11:08 -04:00
Tibor Vass
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
Vincent Demeester
f4dfe15cbe
Merge pull request #21420 from icecrime/update_arm_build
...
Update Dockerfile.armhf
2016-03-23 16:27:53 +01:00
Aleksa Sarai
75a271603c
pkg: archive: don't fail Untar if xattrs are not supported
...
Since certain filesystems don't support extended attributes, ignore
errors produced (emitting a warning) when attempting to apply extended
attributes to file.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-03-24 02:05:36 +11:00
Phil Estes
a1d8441117
Re-enable shared namespace tests for userns CI runs
...
Allow --net=container and --ipc=container tests to run when user
namespaces are enabled.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-03-23 09:39:24 -04:00
Vincent Demeester
6ad9def11a
Merge pull request #21386 from Microsoft/jjh/mountfix
...
Windows: Fix mountinfo
2016-03-23 10:14:20 +01:00
Tibor Vass
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
Tibor Vass
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
Tonis Tiigi
e91de9fb9d
Revert "Move layer mount refcounts to mountedLayer"
...
This reverts commit 563d0711f8
.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-23 00:33:02 -07:00
Lei Jitang
f668e36652
Merge pull request #21407 from LK4D4/log_stats_errors
...
daemon: log errors from stats calls
2016-03-23 14:12:12 +08:00
Tibor Vass
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
Tõnis Tiigi
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
Arnaud Porterie
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
Sebastiaan van Stijn
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
Michael Crosby
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
Tibor Vass
694b32df51
Merge pull request #21370 from tonistiigi/expose-layer-ids
...
Expose RootFS in image inspect
2016-03-22 20:33:18 -04:00
Tibor Vass
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
Tibor Vass
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
David Calavera
fb1365639e
Merge pull request #21406 from LK4D4/fix_streams_race
...
builder: synchronize stderr and stdout
2016-03-22 17:15:01 -07:00
David Calavera
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
Sebastiaan van Stijn
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
Tibor Vass
3ce494f48c
Merge pull request #21367 from mlaventure/containerd-docs-cleanup
...
Remove unneeded references to execDriver
2016-03-22 19:40:27 -04:00
Kenfe-Mickael Laventure
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
Michael Crosby
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
David Calavera
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
David Calavera
506fb9810c
Merge pull request #21396 from aboch/vnn
...
Vendoring libnetwork v0.7.0-dev.10
2016-03-22 15:09:42 -07:00
Tibor Vass
8b8fcb796f
Merge pull request #21303 from riyazdf/notary-vendor-docker1.11
...
vendor notary for docker1.11
2016-03-22 17:57:17 -04:00
David Calavera
2ec1764d45
Merge pull request #21400 from LK4D4/fix_volumes_race
...
volume/local: fix race in List
2016-03-22 14:29:12 -07:00
David Calavera
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
Alexander Morozov
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
Alexander Morozov
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
Tonis Tiigi
14dc4a7158
Expose RootFS in image inspect
...
Fixes #20451
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-22 13:49:30 -07:00
Alessandro Boch
fbdb3c3a4b
Vendoring libnetwork v0.7.0-dev.10
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-03-22 12:36:21 -07:00
Michael Crosby
aca7e73a69
Copy containerd binaries in tgz
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-03-22 12:23:17 -07:00
Tibor Vass
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
Michael Crosby
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
David Calavera
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
Riyaz Faizullabhoy
ab3772f72f
vendor notary for docker1.11
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-03-22 11:28:19 -07:00
Alexander Morozov
3536c09cea
volume/local: fix race in List
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-22 11:21:38 -07:00
Tibor Vass
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
Ken Cochrane
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
Michael Crosby
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
Vincent Demeester
e8774fbb9f
Merge pull request #21366 from martinmosegaard/master
...
Fix plural typo in 'save' command help
2016-03-22 17:26:32 +01:00