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
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
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
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
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
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
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
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
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
d5f0b4ca87
Merge pull request #20002 from twistlock/19575_authz_plugin_support_events
...
Fix 19575: Docker events doesn't work with authorization plugin
Upstream-commit: 862f073694e3b60b89e099cdf12cfb8ec1a6a9e8
Component: engine
2016-02-08 09:10:39 -08:00
7d584ec835
Fourth set of enabling Builder CI tests for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: eed648ac5ac50a17a5202bd7a0b00738727f9e0f
Component: engine
2016-02-05 17:46:06 -08:00
3e59ad891c
Fix 19575: Docker events doesn't work with authorization plugin
...
To support the requirement of blocking the request after the daemon
responded the authorization plugin use a `response recorder` that replay
the response after the flow ends.
This commit adds support for commands that hijack the connection and
flushes data via the http.Flusher interface. This resolves the error
with the event endpoint.
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: 5ffc810df22c3779b4df8ce28d94e4bf89d34e2f
Component: engine
2016-02-05 22:30:01 +02:00
2fc41c0b8b
Combine SetupWorkingDirectory for Linux and Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 6791230320fa9f8ae9df3e90d5c52d85621828a0
Component: engine
2016-02-05 10:27:10 -08:00
78c9a12642
Merge pull request #20011 from Microsoft/MinimalBaseImage
...
Move base image selection to a utility function
Upstream-commit: d4c8d0519d2e521fd8b364d7231973455963e0ba
Component: engine
2016-02-04 18:06:30 -08:00
dc25bc1e26
Merge pull request #20005 from Microsoft/jjh/testrunrestartmaxretries
...
Windows CI: Up timeout TestRunRestartMaxRetries
Upstream-commit: 2da5ad3bb0fb553112751a683ac861ab8fd5b8e2
Component: engine
2016-02-04 16:07:42 -08:00
495762f74d
Move base image selection to a utility function
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 96c522162634ff4d5e55ddf2ff841921a99b7b09
Component: engine
2016-02-04 15:06:34 -08:00
36dd8337c1
Merge pull request #19357 from chenchun/internal
...
Display `internal` flag on `network inspect`
Upstream-commit: 18204ea61690797930efcf2d0a638961664ba0df
Component: engine
2016-02-04 16:31:12 -05:00
9a586d64c2
Merge pull request #19984 from calavera/vendor_engine_api_master
...
Vendor engine-api with client context changes.
Upstream-commit: da58ee42bb1d4e17c5b525d161f29ad8efc0569e
Component: engine
2016-02-04 16:20:06 -05:00
1262ec37e1
Windows CI: Up timeout TestRunRestartMaxRetries
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4a2122e020f2f4637b2a32e1ba2bfa3511988f8f
Component: engine
2016-02-04 11:59:13 -08:00
32fac24f32
Apply context changes to the client.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: fe53be4e1785ab4d8cadf246e5f2de419f337adc
Component: engine
2016-02-04 13:59:57 -05:00
d572e76048
Merge pull request #19994 from runcom/fix-test-for-19936
...
integration-cli: fix minimum and default api version test
Upstream-commit: 3329c94e256d7816ec20edb215d5c3614504e403
Component: engine
2016-02-04 08:33:07 -08:00
25898f320a
Remove stray printf
...
This came in with the Windows CI work and I assume was meant for local
debug, but adds a bare printf line to the test output.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 77590d4dae9223ccd8edf9b153c669f631747f24
Component: engine
2016-02-04 10:13:31 -05:00
83fc309845
integration-cli: fix minimum and default api version test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: fe6b88e3fa12810b2eaad45c613742c1eeb7290e
Component: engine
2016-02-04 13:58:08 +01:00
76c413d163
Merge pull request #19949 from Microsoft/jjh/testapiresize
...
Windows CI: Port docker_api_resize_test.go
Upstream-commit: 38e774d32caf29155d27aad4fad964b082246a73
Component: engine
2016-02-04 10:11:32 +01:00
e109e016c1
Display internal flag on network inspect
...
Also adds internal network tests for bridge network
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: c199506b59f60ac456cb0448ddd86e6dec92bc0a
Component: engine
2016-02-04 15:28:37 +08:00
96b7f387ba
Windows CI: Port docker_api_resize_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4080ce35e0ffec4703c04e8d9fa0e2def41fddfe
Component: engine
2016-02-03 20:30:06 -08:00
9044b5c3c7
Merge pull request #19979 from mavenugo/gccgoci
...
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
Upstream-commit: f0a58947abceb524044d7aa88aeae61523c0bc9b
Component: engine
2016-02-03 20:33:52 -05:00
8ebdd00a4c
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 76a765140e831bdd5b7139b86db001ec6872023a
Component: engine
2016-02-03 14:44:55 -08:00
e930e772f5
Merge pull request #19942 from LK4D4/fix_vet_errors
...
Fix minor vet warnings
Upstream-commit: fdcce4ac0302729be91ff9de670fdb5be1c50b58
Component: engine
2016-02-03 13:31:11 -08:00
3f8eca9ec3
Merge pull request #19943 from aboch/ec
...
Store endpoint config on network connect to a stopped container
Upstream-commit: 3b80b1947c0f7ac879c4fdf5d6f50e5e3e97d07e
Component: engine
2016-02-03 11:06:35 -08:00
5649ae9668
Merge pull request #19959 from WeiZhang555/fix-cli-print-err
...
Remove redundant error message
Upstream-commit: 28a7577a029780e4533faf3d057ec9f6c7a10948
Component: engine
2016-02-03 10:56:19 -08:00
7eab87efde
Fix minor vet warnings
...
Also use Asserts where it's possible.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 7a20a270bc7ce34c9a6f7cc9eebb38c0bb332b7f
Component: engine
2016-02-03 10:43:01 -08:00
3e36908d7b
Add a getPrefixAndSlashFromDaemonPlatform …
...
… to limit code duplication in integration tests :P
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 382c96ee7b02f393e7515e4cc4882738398b86a6
Component: engine
2016-02-03 15:16:00 +01:00
7f7ec57612
Merge pull request #19948 from Microsoft/jjh/testclirm
...
Windows CI: Port docker_cli_rm_test.go
Upstream-commit: bc082033147418c9d2b45dad104f84e8a6d29ae9
Component: engine
2016-02-03 15:05:21 +01:00
e9b0659a70
Merge pull request #19947 from Microsoft/jjh/testclistart
...
Windows CI: Port docker_cli_start_test.go
Upstream-commit: 0736dba624e616d8b8af26f03ea1a438535e8dc1
Component: engine
2016-02-03 13:40:55 +01:00
5f2192d684
Merge pull request #19946 from Microsoft/jjh/stats
...
Windows: Turn off stats
Upstream-commit: 4ef06e9ef18e7538c71818175d3228ba65c00b64
Component: engine
2016-02-03 09:28:25 +01:00
68f96de053
Remove redundant error message
...
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 894266c1bbdfeb53bf278f3cb762945bac69e592
Component: engine
2016-02-03 15:45:20 +08:00
298796a142
Disable flakey TestClientSetsTLSServerName
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6b8341a2d529ff6489e77ef6d496a2054af31cd5
Component: engine
2016-02-02 19:56:31 -08:00
cc8995d14c
Windows CI: Port docker_cli_rm_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 07fd173225408342de76f749c2a5bccadec32d3a
Component: engine
2016-02-02 18:43:50 -08:00
40c9bed676
Windows CI: Port docker_cli_start_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b47749102d8bfde1ec6f87b2cd291b8f45146b67
Component: engine
2016-02-02 18:23:29 -08:00
cf751d8144
Windows: Turn off stats
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 55268f4e9158738631f04e7e4becf39c9043b60a
Component: engine
2016-02-02 17:59:11 -08:00
