746f6af9aa
Sort the attributes for events
...
This is add support for #19559
We tried sort it in client side, and it sort follow go
sort : sorts a slice of strings in increasing order.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-01 00:18:33 +00:00
5f5a752bcf
Merge pull request #19847 from Microsoft/jjh/revert19790
...
Revert PR 19790 (breaks windowsTP4 CI on cache bust)
2016-01-30 20:28:21 +01:00
667c2245ad
Merge pull request #19820 from Microsoft/jjh/testexecapi
...
Windows CI: Port TestExecApi* tests
2016-01-30 11:50:01 +01:00
98ef10f64e
Merge pull request #19839 from Microsoft/jjh/testevents
...
Windows CI: Porting TestEvents*
2016-01-30 11:47:44 +01:00
54320d8d18
Signed-off-by: John Howard <jhoward@microsoft.com>
...
Revert "Combine SetupWorkingDirectory for Linux and Windows"
This reverts commit ec31741ca1
2016-01-29 20:49:39 -08:00
9c3cca23e9
Merge pull request #19815 from Microsoft/jjh/testruncreatevolumesinsymlinkdir
...
Fix TestRunCreateVolumesInSymlinkDir
2016-01-29 21:07:51 -05:00
35ef3efe9a
Merge pull request #19805 from WeiZhang555/test-inspect
...
Make test code consistent
2016-01-29 12:43:58 -08:00
bf33742026
Windows CI: Porting TestEvents*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-29 12:33:56 -08:00
90b0292b5b
Fix TestRunCreateVolumesInSymlinkDir
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-29 09:28:48 -08:00
62a856e912
Assert error in body of function `inspectField*`
...
1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code
cleaner and more consistent
2. assert the error in function `inspectField*` so we don't need to
assert the return value of it every time, this will make inspect easier.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-29 23:39:07 +08:00
5f63c54192
Merge pull request #19790 from Microsoft/CombineSetupWorkingDir
...
Combine SetupWorkingDirectory for Linux and Windows
2016-01-29 08:52:08 +01:00
7d13f2fb7d
Merge pull request #19563 from Microsoft/10662-TestBuildCI1
...
First batch of Windows-Windows TestBuild CI enabling
2016-01-28 17:13:45 -08:00
9642c8170a
Windows CI: Port TestExecApi* tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-28 16:26:06 -08:00
87839b345e
Temporarily removing TestBuildHistory on Windows for perf reasons
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-01-28 13:42:02 -08:00
ec31741ca1
Combine SetupWorkingDirectory for Linux and Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-01-27 16:17:35 -08:00
0f5aa19593
Merge pull request #19767 from icecrime/factorize_sleeping_container
...
Factorize sleeping containers
2016-01-27 13:42:56 -08:00
c39c7e6edf
Merge pull request #19760 from cyli/re-vendor-notary
...
Re-vendor Notary and docker/go
2016-01-27 09:36:26 -08:00
777ee34b07
Factorize sleeping containers
...
Add `runSleepingContainer` and `runSleepingContainerInImage` helper
functions to factor out the way to run system-specific idle containers.
Define a sleeping container as command `top` in image `busybox` for
Unix and as command `sleep 60` in image `busybox` for Windows. Provide a
single point of code to update those.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-01-27 08:48:08 -08:00
c1b168664f
Merge pull request #19764 from Microsoft/jjh/testinspectapi
...
Windows CI: PortTestInspectApi*
2016-01-27 14:08:28 +01:00
3c61f00616
Windows CI: PortTestInspectApi*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 20:23:40 -08:00
916b9db71d
Windows CI: Darn it, I broke due to multiple declarations
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 19:58:53 -08:00
3cf4884787
Merge pull request #19612 from Microsoft/jjh/apicontainerstest
...
Windows CI: Fixup docker_api_containers_test.go
2016-01-26 19:14:43 -08:00
603c04a789
Merge pull request #19744 from Microsoft/jjh/testhistory
...
Windows CI: Enable TestHistory* cli tests
2016-01-26 19:08:33 -08:00
864cca2287
Merge pull request #19605 from Microsoft/jjh/docker_api_images_test
...
Windows CI: Porting for docker_api_images_test.go
2016-01-26 19:04:25 -08:00
70c5e96cb8
Merge pull request #19604 from Microsoft/jjh/testrename
...
Windows CI: Fix TestRename*
2016-01-26 19:03:31 -08:00
51d4d8eff2
Merge pull request #19603 from Microsoft/jjh/testps
...
Windows CI: Address simple failures in TestPS*
2016-01-26 19:01:17 -08:00
9b82174f93
Merge pull request #19742 from Microsoft/jjh/testrmi
...
Windows CI: Port TestRmi tests
2016-01-26 21:46:35 -05:00
0617521ba2
Update integration tests with new error messages, and to use different repos per test.
...
This way we won't encounter any problems with one test using cached data from a different
test.
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-01-26 18:02:00 -08:00
146e49b039
Merge pull request #19671 from calavera/volume-dangling
...
Make volume dangling filter return only used volumes with `dangling=false`.
2016-01-26 17:01:20 -05:00
0b248e88ff
Merge pull request #19734 from Microsoft/jjh/testtag
...
Windows CI: Port TestTag* cli tests
2016-01-26 22:56:36 +01:00
4adb0fb310
Merge pull request #19723 from bboreham/not-preferred
...
Stop referring to requested IP address as "preferred"
2016-01-26 13:46:09 -08:00
15c32f39a9
Windows CI: Enable TestHistory* cli tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 12:42:09 -08:00
94e5fab5ed
Windows CI: Port TestRmi tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 12:22:37 -08:00
563a4d1b9f
First batch of Windows-Windows TestBuild CI enabling
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-01-26 12:15:13 -08:00
1723c6477f
Windows CI: Port TestTag* cli tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-26 10:41:31 -08:00
c56e309d05
Merge pull request #19712 from runcom/test-requires-apparmor
...
integration-cli: require Apparmor
2016-01-26 09:18:29 -08:00
269a6d7d36
Merge pull request #19705 from mavenugo/18222
...
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
2016-01-26 09:16:57 -08:00
7a97e938e2
Merge pull request #19490 from cyphar/remove-dockerinit
...
Remove dockerinit once and for all
2016-01-26 08:27:35 -08:00
7126ecd0ad
Stop referring to requested IP address as "preferred",
...
since it is an error if that address is unavailable.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2016-01-26 15:13:26 +00:00
fc8e344297
Merge pull request #19715 from coolljt0725/fix_test_daemon
...
Test utils: fix daemon start utils
2016-01-26 10:08:50 -05:00
e5b5c0ebe8
Merge pull request #19713 from WeiZhang555/opt-TestEventsContainerFailStartDie
...
Optimize `TestEventsContainerFailStartDie`
2016-01-26 09:32:52 -05:00
e88258ca2e
Test utils: fix daemon start utils
...
User call `Start` could with args, and the args could
contains `--storage-driver`, but in `Start`, it will add
`--storage-driver` even though user has specified `--storage-driver`
in args.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-26 08:31:50 -05:00
4357ed4a73
*: purge dockerinit from source code
...
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.
Signed-off-by: Aleksa Sarai <asarai@suse.com>
2016-01-26 23:47:02 +11:00
e38463b277
Move port-mapping ownership closer to Sandbox (from Endpoint)
...
https://github.com/docker/libnetwork/pull/810 provides the more complete
solution for moving the Port-mapping ownership away from endpoint and
into Sandbox. But, this PR makes the best use of existing libnetwork
design and get a step closer to the gaol.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-26 03:59:03 -08:00
4f7dda3fb2
Optimize `TestEventsContainerFailStartDie`
...
Optimize performance of `TestEventsContainerFailStartDie`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-26 19:23:18 +08:00
7ac8c77877
integration-cli: require Apparmor
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-26 11:57:14 +01:00
613e91f36f
Merge pull request #19703 from mountkin/speedup-TestEventsAttach
...
optimize DockerSuite.TestEventsAttach
2016-01-26 11:41:31 +01:00
77a0f77e7f
optimize DockerSuite.TestEventsAttach
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-01-26 10:45:45 +08:00
58c2488d07
Merge pull request #19568 from cpuguy83/17907_fix_rmv
...
On container rm, don't remove named mountpoints
2016-01-25 18:13:57 -08:00
2cb8fdd327
Merge pull request #19673 from aboch/epcs
...
Save endpoint config only if endpoint creation succeeds
2016-01-25 16:50:47 -08:00
Kai Qiang Wu(Kennan)
Antonio Murdaca
John Howard
Brian Goff
David Calavera
Zhang Wei
Vincent Demeester
Sebastiaan van Stijn
Darren Stahl
Jess Frazelle
Arnaud Porterie
Doug Davis
cyli
Tibor Vass
Bryan Boreham
Lei Jitang
Aleksa Sarai
Madhu Venugopal
Antonio Murdaca
Shijiang Wei