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
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
e8774fbb9f
Merge pull request #21366 from martinmosegaard/master
...
Fix plural typo in 'save' command help
2016-03-22 17:26:32 +01:00
fc214b4408
add label support for build, networks and volumes
...
build: implement --label
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
network: allow adding labels on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
volume: allow adding labels on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
add tests for build, network, volume
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
vendor: libnetwork and engine-api bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2016-03-22 11:49:06 -04:00
7720338713
Merge pull request #21388 from zhuguihua/move_zfs_options_to_correct_place_in_man_page
...
Move ZFS options to correct place in man page
2016-03-22 08:26:54 +01:00
5a701c3e4c
Update 'save' command help
...
Based on review feedback.
Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
2016-03-22 08:16:52 +01:00
df6def3c0c
Move ZFS options to correct place in man page
...
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
2016-03-22 14:50:49 +08:00
666563b190
Merge pull request #21046 from cyli/use-notary-cli
...
Sign all first-level delegation roles when doing a trusted push
2016-03-22 07:42:21 +01:00
9f327b4c28
Merge pull request #21373 from aaronlehmann/client-user-agent-registry-operations
...
Pass upstream client's user agent through to registry on operations beyond pulls
2016-03-21 21:49:48 -07:00
c937b43abd
WORKDIR is like calling mkdir - but we've not told people
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-03-22 14:05:56 +10:00
adc6ed5a10
Merge pull request #21354 from Microsoft/jjh/getpids
...
Windows: Minimal docker top implementation
2016-03-21 19:59:27 -07:00
faeff5118f
Add parent references support to load/save
...
Restores the correct parent chain relationship
between images on docker load if multiple images
have been saved.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-03-21 19:31:10 -07:00
2b278f4846
Allow net and IPC namespaces to be shared when userns=on
...
Now that the namespace sharing code via runc is vendored with the
containerd changes, we can disable the restrictions on container to
container net and IPC namespace sharing when the daemon has user
namespaces enabled.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-03-21 22:20:26 -04:00
1bf5eb20e5
Add containerd/runc exes to bundle dir after build
...
Not sure if this is the right setup given the containerd change but I need
to have the built version of the nested exes (containerd, runc...) available
to me after the build is completed so I'm always testing using the latest
versions. This PR will copy them into the same bundles dir so people can
them use them if they wish w/o having to build each separately.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-03-21 17:50:59 -07:00
b0ac69b67e
Add explicit flags for volume cp/no-cp
...
This allows a user to specify explicitly to enable
automatic copying of data from the container path to the volume path.
This does not change the default behavior of automatically copying, but
does allow a user to disable it at runtime.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-03-21 20:38:44 -04:00
00bf3c85d0
Give selinux pcp_pmcd_t type access to /var/lib/docker
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-03-21 16:38:26 -07:00
c22d09f563
Merge pull request #21377 from LK4D4/fix_compile
...
runconfig/opts: fix compilation issue
2016-03-21 19:11:09 -04:00
93f5770511
runconfig/opts: fix compilation issue
...
it was introduced with #20566 as a result of merge
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-03-21 15:01:08 -07:00
f9f8708dc6
Merge pull request #20566 from AndrewGuenther/20371-validate-hostname
...
Ensure --hostname is valid
2016-03-21 14:49:16 -07:00
c44e7a3e63
Pass upstream client's user agent through to registry on operations beyond pulls
...
This adds support for the passthrough on build, push, login, and search.
Revamp the integration test to cover these cases and make it more
robust.
Use backticks instead of quoted strings for backslash-heavy string
contstands.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-03-21 14:31:47 -07:00
278d3962a8
Merge pull request #21306 from mgoelzer/issue20001-nodeps
...
Pass upstream client's user agent through to registry on image pulls
2016-03-21 14:26:59 -07:00
11b4c89087
Merge pull request #21301 from cpuguy83/cleaner_file_log
...
Fixes some issues with jsonfile write/read
2016-03-21 14:03:36 -07:00
3ac32cd72e
Merge pull request #21106 from yongtang/20122-volume-one-character
...
Fix one-character directory issue in the volume option (#20122 ).
2016-03-21 16:41:03 -04:00
8af4f89cba
Remove unneeded references to execDriver
...
This includes:
- updating the docs
- removing dangling variables
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-03-21 13:06:08 -07:00
Sebastiaan van Stijn