def405f4e4
Merge pull request #20165 from vdemeester/move-validatecontextdirectory-to-builder
...
Move validateContextDirectory to builder package.
Upstream-commit: e18eb6ef394522fa44bce7a3b9bb244d45ce9b56
Component: engine
2016-02-10 08:35:25 -08:00
f6ab952c46
Merge pull request #20183 from hypriot/fix-20002-for-multiarch
...
Fix TestAuthZPluginAllowEventStream for multiarch
Upstream-commit: 7e44d0ca5872290a9b56c0a381bc370a3ffbc603
Component: engine
2016-02-10 09:42:35 -05:00
0a01ad0c9c
Merge pull request #19835 from ncdc/resize-after-attach
...
Move resize after attaching
Upstream-commit: c2ebdb3e573cbbb053eb4644119f3c99a6111bdc
Component: engine
2016-02-10 15:32:51 +01:00
a2afb60dcc
Merge pull request #20181 from mavenugo/v0.6.1-rc2
...
Vendor libnetwork v0.6.1-rc2
Upstream-commit: f9abd42b98ec1b56cfa5d7d27562e8178136f1ac
Component: engine
2016-02-10 09:25:55 -05:00
403bf945a4
Merge pull request #20174 from tophj-ibm/remove-power-from-logrus-tests
...
PPC64LE: Remove testing logrus output from ppc64le
Upstream-commit: cfa806378eafd159fce4b1158b215564419680d0
Component: engine
2016-02-10 09:07:47 -05:00
8fa8b7aec3
Merge pull request #20173 from duglin/FixEnvDoc
...
Make it clear that env vars must be simple
Upstream-commit: e54ac9b3a1354daf7dd28f9bfd6fc411a25c4531
Component: engine
2016-02-10 13:22:29 +00:00
31c6500d5a
Fix TestAuthZPluginAllowEventStream for multiarch
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 36a974a1a6267828b773de19ed298947c66c4945
Component: engine
2016-02-10 07:28:50 +01:00
878a07f809
Vendor libnetwork v0.6.1-rc2
...
- Fixes #20132 #20140 #20019
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 84705f15d9b0226fa005cada11cad2ad5aad5179
Component: engine
2016-02-09 21:46:50 -08:00
c88ca91e41
Merge pull request #20135 from vdemeester/20087-fix-since-before-filters
...
Fix the since and before filter behavior
Upstream-commit: 61efb4d08487623474d6c21d68b0b34a2117da67
Component: engine
2016-02-09 21:13:00 -05:00
9394f6b721
Merge pull request #19661 from shishir-a412ed/tests_rootfs_pr
...
Tests for PR # 19123: daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Upstream-commit: 321f2913241145061088769ab887ec7c27a87c70
Component: engine
2016-02-09 17:30:48 -08:00
6d4102dcb8
Merge pull request #20133 from mlaventure/dont-bind-mount-mqueue
...
Prevent mqueue from implicitely becoming a bind mount with --ipc=host
Upstream-commit: 0b4a7fb06d4b77265831cee1508aad9fbeddb7a2
Component: engine
2016-02-09 19:55:57 -05:00
7d8fc9149c
Merge pull request #19985 from Microsoft/CombineSetupWorkingDir
...
Combine SetupWorkingDirectory for Linux and Windows
Upstream-commit: d6870238e329e43d2df291a5f82d27929f9a192d
Component: engine
2016-02-09 15:18:49 -08:00
8072979e73
Merge pull request #18943 from cpuguy83/fix_write_flusher
...
Remove Exists from backend
Upstream-commit: b3cb0d196d17aa04ca98292536b1f66e4490bbc5
Component: engine
2016-02-09 15:16:03 -08:00
7d5beb3fd8
Remove testing logrus output from ppc64le
...
This removes two tests on ppc64le.
There is an old bug with a syscall on power #8653 , that causes
logrus to default to using logfmt. These two tests look for
logrus format specific strings, and fail if they don't see it.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 736e93a468fe8b8530ec5d00b9be7bbd53e306fc
Component: engine
2016-02-09 18:02:18 -05:00
53c71bfb0a
Merge pull request #20059 from Microsoft/10662-TestBuildCI4
...
Fourth set of enabling Builder CI tests for Windows
Upstream-commit: 08d0a8384fdacf3fbb9230194efa18e91e382d56
Component: engine
2016-02-09 23:19:28 +01:00
58b0a87b35
Merge pull request #20167 from jfrazelle/butts
...
remove tasksmax, people on newer kernels can add it themselves
Upstream-commit: cb4a22b1a94e77f294e653d2ac07019d7ddf5edd
Component: engine
2016-02-09 14:18:51 -08:00
a7fd8e1725
Disable TestRunMountshmmqueuefromhost when using userns
...
Since we now automatically mount the mqueue device inside the
container (instead of bind mounting the one from the host), when
trying to start a container with --ipc=host, the mount will fail with
EPERM.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: dba5a7f243e6c251176585571419b595172e9402
Component: engine
2016-02-09 14:16:08 -08:00
24558a48dd
Prevent mqueue from implicitely becoming a bind mount with --ipc=host
...
Currently, when running a container with --ipc=host, if /dev/mqueue is
a standard directory on the hos the daemon will bind mount it allowing
the container to create/modify files on the host.
This commit forces /dev/mqueue to always be of type mqueue except when
the user explicitely requested something to be bind mounted to
/dev/mqueue.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: f7d4abdc00d521509995da1070215c808fe0fd9c
Component: engine
2016-02-09 14:16:08 -08:00
a5ddabd8b8
remove tasksmax, people on newer kernels can add it themselves
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 624125082414d5ba4a987657a44a8506920da611
Component: engine
2016-02-09 14:07:23 -08:00
566c96f73b
Move validateContextDirectory to builder package.
...
This feels like it's where it belongs and it makes it exported
again (which is needed for libcompose that was using it before 1.10).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: fc6122a947f9eb9fc2f54fb8ba3b9da4531a6b99
Component: engine
2016-02-09 22:19:09 +01:00
6ae6421b5c
Merge pull request #20158 from cpuguy83/carry_19504
...
Dockerfile,contrib,hack: remove buildpack-deps
Upstream-commit: fa860c86ff0a368e686535c2689d1099fa9ea7a2
Component: engine
2016-02-09 14:58:37 -05:00
26a1a8c70f
cleanup attach api calls
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: a77b7dd2278106b9081d0ef2260fbeea790a91ef
Component: engine
2016-02-09 14:26:51 -05:00
d949b11a4e
Fix horribly broken TestGetContainerStatsNoStream
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 3434860d54d547167d08fdcf3aefaaab06aff2c0
Component: engine
2016-02-09 14:25:05 -05:00
571e442f4c
Move stream flushes to backend
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: ae4ee974e80c5d650fdcbc0a6f5ab3245a7f1689
Component: engine
2016-02-09 14:25:02 -05:00
39a54ff7ac
Cleanup WriteFlusher
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 96f1a1a10b63ac446f0d9da8521cd871212a1063
Component: engine
2016-02-09 14:02:26 -05:00
d2b4b76ae0
Merge pull request #19983 from srust/volume_get_compat_hack
...
[1.10] Fix volume driver API compatibility mode (a little)
Upstream-commit: 10226ac845e5a13350c5c4e5667cc2602c196112
Component: engine
2016-02-09 10:47:30 -08:00
cb2b73c937
Merge pull request #20157 from chadswen/fix-typo-toolbox-upgrade
...
Fix typo in Docker Toolbox upgrade section
Upstream-commit: a03c2a005a0928e7e847be26c8fefd4f30a8d816
Component: engine
2016-02-09 18:14:30 +00:00
1a2b70c103
use debian:jessie for ensure-syscall-test
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7c9e9afeb78ad3265c2ec5d4c6969c0d6182af2b
Component: engine
2016-02-09 13:13:38 -05:00
c2c6a44646
Merge pull request #20090 from albers/completion-map-values
...
Improve key specific bash subcompletions
Upstream-commit: 9f2f52de8e6412738457b7b6846d2d9037bef6a1
Component: engine
2016-02-09 17:39:35 +00:00
5934d3cb06
Fix typo in Docker Toolbox upgrade section
...
Signed-off-by: Chad Swenson <chadswen@gmail.com >
Upstream-commit: 1435c9ea21d6c76a923c2501abb840e899b5ed1e
Component: engine
2016-02-09 11:36:45 -06:00
7c786e7b60
Merge pull request #20117 from twistlock/userns_tests
...
Move userns cli test to a separate file, remove experimental flag
Upstream-commit: d2a2f5bedc1c3bfca6423b647c0186f65cd31012
Component: engine
2016-02-09 09:10:44 -08:00
23e36e7084
Merge pull request #20130 from Microsoft/sjw/windows_save_fix
...
Fixing 'docker save' on Windows.
Upstream-commit: 01a19257923af7fc02bb24113148818a0facb441
Component: engine
2016-02-09 07:47:58 -08:00
cac10ff771
Tests for PR # 19123: daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 07184599f71af0ef5b29d025bf1eae6432ae37f3
Component: engine
2016-02-09 10:47:31 -05:00
d6af17ee30
Merge pull request #20116 from muthu-r/master
...
Add Horcrux volume plugin to plugins.md
Upstream-commit: f5ed72c931d373bd56069d44ba3b7370acd1f475
Component: engine
2016-02-09 09:59:26 +00:00
05a9f24f32
Fix the since and before filter behavior
...
Filters should not include stopped container if `-a` is not specified.
Right now, before and since filter are acting as --before and --since
deprecated flags. This commit is fixing that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b41dba58a01855e0d222bd6c14af9874c298c154
Component: engine
2016-02-09 09:26:20 +01:00
67892dedf8
Move userns cli test to a separate file, remove experimental flag
...
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: df636ef45addcb6ff2555e3da2bc61fc25cc5603
Component: engine
2016-02-09 09:31:09 +02:00
4075818bf4
Fix volume driver API compatibility mode (a little)
...
Signed-off-by: Stephen Rust <srust@blockbridge.com >
Upstream-commit: c3985bdf797a4526eac5fb0bd92047ac0f8513d9
Component: engine
2016-02-08 23:12:29 -05:00
0b639e2753
Fixing 'docker save' on Windows.
...
Save was failing file integrity checksums due to bugs in both
Windows and Docker. This commit includes fixes to file time handling
in tarexport and system.chtimes that are necessary along with
the Windows platform fixes to correctly support save. With this
change, sysfile_backups for windowsfilter driver are no longer
needed, so that code is removed.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: 041a9510c671ecf4724bf15388fdb9de549b04ed
Component: engine
2016-02-08 18:08:49 -08:00
6675019158
Make it clear that env vars must be simple
...
Closes #20169
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: d579490b2bd2396c74a48c5c6f41ffc94cd4febd
Component: engine
2016-02-08 18:02:37 -08:00
eca7daefb9
Add Horcrux volume plugin to plugins.md
...
Signed-off-by: Muthukumar R <muthur@gmail.com >
Upstream-commit: 58427fd8a684f0e4b999d99d6a123b40112d2094
Component: engine
2016-02-08 15:16:56 -08:00
bef9eb0770
Merge pull request #20118 from aditirajagopal/20110-update-client-lib-projects
...
Update List of Client Library Projects
Upstream-commit: ac9d1b7b47c8fb429f7f84477a042dd9d58e858f
Component: engine
2016-02-08 15:06:53 -08:00
5f7a1b8686
Merge pull request #19772 from calavera/decouple-server-routers
...
[Carry 19133] Decouple server routers from the daemon package.
Upstream-commit: 8c6887c54d033107d66ca70f0c84736fe4b90775
Component: engine
2016-02-08 17:54:49 -05:00
5bd791913c
Merge pull request #20106 from jfrazelle/go-generate-json-default-profile
...
add default seccomp profile as json
Upstream-commit: 3846951fce14d7e66a9e51fefcaadece47bd5ab4
Component: engine
2016-02-08 14:48:34 -08:00
87068955df
Update List of Client Library Projects
...
Resolves : #20110
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
Upstream-commit: 47dbb59e5b5d3472f9391e965131015d83d614a4
Component: engine
2016-02-08 16:16:42 -06:00
71232b661d
Merge pull request #19711 from coolljt0725/fix_19679
...
Clean up container rootf mounts on daemon start, fixes #19679
Upstream-commit: 54b67fe12fb20bdd920d0335f70720ca3e60f505
Component: engine
2016-02-08 16:21:50 -05:00
cb9f693ca8
add validation for generating default secccomp profile
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 9bc771af9d09026111916191394eb2896608eb59
Component: engine
2016-02-08 13:04:52 -08:00
d40e26fc39
Merge pull request #20109 from thaJeztah/add_tcp_tls_proto
...
Fix 'tcp+tls' protocol not being accepted
Upstream-commit: 14c63189a1dec205b9e2d64482cff30a1af6b5ac
Component: engine
2016-02-08 11:22:33 -08:00
a332573aa7
adding note about go version 1.5 requirement for hardware signing
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
Upstream-commit: 1cc950b52ecd990016275f7df3bb21685284c79a
Component: engine
2016-02-08 10:25:02 -08:00
68180e8e6f
Merge pull request #20068 from ilkka/patch-1
...
Tweak VM volume mapping paragraph
Upstream-commit: efdbe2ba5a3b73b61d19393c87c5da0807f5f2a9
Component: engine
2016-02-08 09:54:23 -08:00
b8acba957f
Move backend types to their own package.
...
- Remove duplicated structs that we already have in engine-api.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 06d8f504f7b1883f490b5deda5a30ef9acd99f95
Component: engine
2016-02-08 12:42:17 -05:00
