88afeb1908
Combine SetupWorkingDirectory for Linux and Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: ec31741ca186278ea60faf49f85087c493e78806
Component: engine
2016-01-27 16:17:35 -08:00
430a04619f
Merge pull request #19767 from icecrime/factorize_sleeping_container
...
Factorize sleeping containers
Upstream-commit: 0f5aa19593dd2258a26adf37e41e00cbbbab8cf1
Component: engine
2016-01-27 13:42:56 -08:00
0da34ddb69
Merge pull request #19760 from cyli/re-vendor-notary
...
Re-vendor Notary and docker/go
Upstream-commit: c39c7e6edf7d432730a84fa549b74203954b54c4
Component: engine
2016-01-27 09:36:26 -08:00
7f9cdda847
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 >
Upstream-commit: 777ee34b075292e5aee16c4088444508899f8f35
Component: engine
2016-01-27 08:48:08 -08:00
7835159bd3
Merge pull request #19764 from Microsoft/jjh/testinspectapi
...
Windows CI: PortTestInspectApi*
Upstream-commit: c1b168664f3b0d92164f1a4308ad6c653d38cf40
Component: engine
2016-01-27 14:08:28 +01:00
380ad90e75
Windows CI: PortTestInspectApi*
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3c61f006162f2781651dda764dddcf4af4957846
Component: engine
2016-01-26 20:23:40 -08:00
2f92225c3a
Windows CI: Darn it, I broke due to multiple declarations
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 916b9db71d6de8db8731a6d881079a7a8e61eb64
Component: engine
2016-01-26 19:58:53 -08:00
f913d7db9f
Merge pull request #19612 from Microsoft/jjh/apicontainerstest
...
Windows CI: Fixup docker_api_containers_test.go
Upstream-commit: 3cf4884787b6543dd325cd9f66be7338f2b9997e
Component: engine
2016-01-26 19:14:43 -08:00
d39dd64150
Merge pull request #19744 from Microsoft/jjh/testhistory
...
Windows CI: Enable TestHistory* cli tests
Upstream-commit: 603c04a789832652ef141f14bea82f66f974a910
Component: engine
2016-01-26 19:08:33 -08:00
bd0e0077d9
Merge pull request #19605 from Microsoft/jjh/docker_api_images_test
...
Windows CI: Porting for docker_api_images_test.go
Upstream-commit: 864cca2287f7605a2b973e9bad7e4c4330f5662e
Component: engine
2016-01-26 19:04:25 -08:00
7377fa761c
Merge pull request #19604 from Microsoft/jjh/testrename
...
Windows CI: Fix TestRename*
Upstream-commit: 70c5e96cb8bd6b826006f73102135bf74e2fa877
Component: engine
2016-01-26 19:03:31 -08:00
e1fbe13aaa
Merge pull request #19603 from Microsoft/jjh/testps
...
Windows CI: Address simple failures in TestPS*
Upstream-commit: 51d4d8eff214ce1ec97d652f00cc70e822e6aba7
Component: engine
2016-01-26 19:01:17 -08:00
8e0d35beb6
Merge pull request #19742 from Microsoft/jjh/testrmi
...
Windows CI: Port TestRmi tests
Upstream-commit: 9b82174f93e90e7b24146df823a07cde6df60891
Component: engine
2016-01-26 21:46:35 -05:00
142063ee1c
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 >
Upstream-commit: 0617521ba2ce160899852bb707c15bae7309f18a
Component: engine
2016-01-26 18:02:00 -08:00
92c9319930
Merge pull request #19671 from calavera/volume-dangling
...
Make volume dangling filter return only used volumes with `dangling=false`.
Upstream-commit: 146e49b039c59107cc31de734f0bf5d4604c04d9
Component: engine
2016-01-26 17:01:20 -05:00
0c72855bb7
Merge pull request #19734 from Microsoft/jjh/testtag
...
Windows CI: Port TestTag* cli tests
Upstream-commit: 0b248e88ffa20f6537dff2c4f013c5a33ffe7656
Component: engine
2016-01-26 22:56:36 +01:00
5c9f48b079
Merge pull request #19723 from bboreham/not-preferred
...
Stop referring to requested IP address as "preferred"
Upstream-commit: 4adb0fb310737061c5a8f7d7264139daa4fb07e1
Component: engine
2016-01-26 13:46:09 -08:00
24442de326
Windows CI: Enable TestHistory* cli tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 15c32f39a94bb389087389e03ae4e2429dc851a0
Component: engine
2016-01-26 12:42:09 -08:00
b6a52ab8d2
Windows CI: Port TestRmi tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 94e5fab5ed04a6cd47a4aa74024f79c75aadca03
Component: engine
2016-01-26 12:22:37 -08:00
c572fa49af
Windows CI: Port TestTag* cli tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1723c6477f93c2cdb57212c188c7121211bba82b
Component: engine
2016-01-26 10:41:31 -08:00
57013f74fa
Merge pull request #19712 from runcom/test-requires-apparmor
...
integration-cli: require Apparmor
Upstream-commit: c56e309d05a121a509716f887ebc9df065a8fd18
Component: engine
2016-01-26 09:18:29 -08:00
eed5e0f1c7
Merge pull request #19705 from mavenugo/18222
...
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
Upstream-commit: 269a6d7d3656fe7edf7cb630125ee4664dd24c78
Component: engine
2016-01-26 09:16:57 -08:00
12928bbe9c
Merge pull request #19490 from cyphar/remove-dockerinit
...
Remove dockerinit once and for all
Upstream-commit: 7a97e938e2229fa7a50b0f6e66c70eddcb9d2dc2
Component: engine
2016-01-26 08:27:35 -08:00
fa73e1295e
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 >
Upstream-commit: 7126ecd0ad1f6188540949cbdbca20f4a75d1839
Component: engine
2016-01-26 15:13:26 +00:00
fc9234dc9d
Merge pull request #19715 from coolljt0725/fix_test_daemon
...
Test utils: fix daemon start utils
Upstream-commit: fc8e3442976c189cfc770ca2dcedbf68cd8a9a1b
Component: engine
2016-01-26 10:08:50 -05:00
286b4c8bf1
Merge pull request #19713 from WeiZhang555/opt-TestEventsContainerFailStartDie
...
Optimize `TestEventsContainerFailStartDie`
Upstream-commit: e5b5c0ebe80a3f65f8583ffe31eb692686965fef
Component: engine
2016-01-26 09:32:52 -05:00
31ed090a9a
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 >
Upstream-commit: e88258ca2ef0047973168a29fd9ec27669582c0e
Component: engine
2016-01-26 08:31:50 -05:00
4edafc3bc1
*: 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 >
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
2016-01-26 23:47:02 +11:00
578fa2d8c0
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 >
Upstream-commit: e38463b2779f455b4173171d5a1fdb115180a7e9
Component: engine
2016-01-26 03:59:03 -08:00
d169ea09c5
Optimize TestEventsContainerFailStartDie
...
Optimize performance of `TestEventsContainerFailStartDie`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 4f7dda3fb29b2ac39731b1a54571ad96435fff83
Component: engine
2016-01-26 19:23:18 +08:00
8ef9af1262
integration-cli: require Apparmor
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 7ac8c778779253a5debff36453c9c31900e534e9
Component: engine
2016-01-26 11:57:14 +01:00
46aa3a9f0e
Merge pull request #19703 from mountkin/speedup-TestEventsAttach
...
optimize DockerSuite.TestEventsAttach
Upstream-commit: 613e91f36fca59aaa6225ff9a3acd501583e2d85
Component: engine
2016-01-26 11:41:31 +01:00
6122ebd263
optimize DockerSuite.TestEventsAttach
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 77a0f77e7f605cfe322ce66cf69b3571293a7aeb
Component: engine
2016-01-26 10:45:45 +08:00
360e6f6c70
Merge pull request #19568 from cpuguy83/17907_fix_rmv
...
On container rm, don't remove named mountpoints
Upstream-commit: 58c2488d07f4c984c853ca4b4a5c86b55c4c784c
Component: engine
2016-01-25 18:13:57 -08:00
32f69056a3
Merge pull request #19673 from aboch/epcs
...
Save endpoint config only if endpoint creation succeeds
Upstream-commit: 2cb8fdd3279344b10b0ba651ca42ea38fd88c42f
Component: engine
2016-01-25 16:50:47 -08:00
2ab9f176ff
Merge pull request #19560 from aboch/mn
...
Reject multiple networks on container creation request
Upstream-commit: f7abff4f818847694f4a9beeeef63879d28e0e60
Component: engine
2016-01-25 14:57:51 -08:00
0daaeefa19
Merge pull request #19674 from tonistiigi/19652-fix-create-error-message
...
Fix error message in container creation
Upstream-commit: 0f0c35960f4c8ce74cdbe2626a6b3d115e9a7c14
Component: engine
2016-01-25 23:47:57 +01:00
8dcd01de07
Merge pull request #19619 from WeiZhang555/test-bottleneck-oomtrue
...
Optimize TestEventsOOMDisableTrue
Upstream-commit: cf44f17258cab10704ed0eff48f8e129eaa9874b
Component: engine
2016-01-25 14:24:46 -08:00
e27cdfa32d
Merge pull request #19555 from hypriot/update-registry-on-dockerfile-armhf
...
Update registry version in Dockerfile.armhf
Upstream-commit: 156e2f0e5c2190a31caef9d91116ee1008ee27e3
Component: engine
2016-01-25 14:14:00 -08:00
b4580f4ebd
Merge pull request #19528 from cpuguy83/19475_abck_compat_for_vol_drivers
...
Add back compat for volume drivers `Get` and `Ls`
Upstream-commit: 268a20af952fc47705d4698237d874726db3df8c
Component: engine
2016-01-25 13:53:51 -08:00
6f75e7937c
Save endpoint config only if endpoint creation succeeds
...
- Currently it is being save upfront...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 733245b2e7517b88cdfb188f9d8418f29bca6338
Component: engine
2016-01-25 13:43:32 -08:00
9d1352af0d
Make volume dangling filter return only used volumes with dangling=false.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1431b623a4809ec3992a357387037366ab083548
Component: engine
2016-01-25 16:26:51 -05:00
7e07ac8939
On container rm, don't remove named mountpoints
...
This makes it so when calling `docker run --rm`, or `docker rm -v`, only
volumes specified without a name, e.g. `docker run -v /foo` instead of
`docker run -v awesome:/foo` are removed.
Note that all volumes are named, some are named by the user, some get a
generated name. This is specifically about how the volume was specified
on `run`, assuming that if the user specified it with a name they expect
it to persist after the container is cleaned up.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: dd7d1c8a02d8693aa4f381f82c5bbdcad9a5ff58
Component: engine
2016-01-25 15:51:28 -05:00
fc335b54af
Reject multiple networks on container creation
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: cfa515fd9d1530bd84e98c6d6564e641dcb2d0fe
Component: engine
2016-01-25 12:50:01 -08:00
f06c5a3e4c
Fix error message in container creation
...
Error message was different if image was specified with the full ID.
Fixes #19652
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8a68315c38d7e62b140e145766e842de07d0422d
Component: engine
2016-01-25 11:45:20 -08:00
5bf3651a12
Merge pull request #19615 from runcom/add-registry-with-auth-testsuite
...
integration-cli: add suite for testing registries with auth
Upstream-commit: 15cc67b73d619cf2a624146b4c19855117f1a842
Component: engine
2016-01-25 11:12:16 -08:00
51c4939d36
Merge pull request #19658 from wenchma/19425-daemon_ipv6
...
Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR
Upstream-commit: 997e61add95c26987f56c9b096f6b5ed93641184
Component: engine
2016-01-25 14:04:54 -05:00
0d8c98487d
Optimize slow integration test
...
Optimize `TestEventsOOMDisableTrue` performance
It's part of #19425 issue.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 6bf5b3db9a06e07591675957c48de8b91eeb21b8
Component: engine
2016-01-26 00:07:20 +08:00
eb32283c48
speed up DockerDaemonSuite.TestDaemonRestartWithContainerRunning
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: c983996e0bdc3becd3c7bf79329ad367b9f1a8b1
Component: engine
2016-01-25 23:45:13 +08:00
328772ec19
Optimize slow bottleneck tests of TestDaemonIPv6FixedCIDR and TestDaemonIPv6FixedCIDRAndMac
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 73849a5c82ed816348179bd0ea6461ec8941cc04
Component: engine
2016-01-25 23:43:49 +08:00
