a35a169675
Merge pull request #25171 from cpuguy83/23545_test_sockets_in_separate_dir
...
Use temp dir for integration daemon sockets
Upstream-commit: f23c3a1263b4549030488938741ec6656f2f0133
Component: engine
2016-08-02 01:21:22 +02:00
3564d84153
Remove unnecessary CmdWithArgs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c0d2f7b33869cf749efcbab003bdb9bd2f665cec
Component: engine
2016-07-28 20:14:14 -04:00
b20b8c2790
Use temp dir for integration daemon sockets
...
Instead of using the bundles dir, which may be mounted in and ultimately
break if using b2d/d4mac/d4win. This makes it much easier to collect
test daemon logs and more natural for use d4mac/d4win users to run tests.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4804eb700c3b9f0e337abc6e3c51b031c0328482
Component: engine
2016-07-28 12:53:56 -04:00
7f898cc8b4
Use const http status code instead of just numbers see #24783
...
Signed-off-by: Doron Podoleanu <doronp@il.ibm.com >
Upstream-commit: 6bec735c91c378e1c9cde1744e7c8aca7397104a
Component: engine
2016-07-19 10:40:20 +03:00
be80ca6785
Skip always pulling images on integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e2226223e614716749cdb7701a130c7449f5f854
Component: engine
2016-06-20 17:45:29 -07:00
7a33d63cb2
Swarm integration tests
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 0d88d5b64b69a451d374e322b2abe64140a6cd1c
Component: engine
2016-06-13 22:16:18 -07:00
f408291a41
Use dockerd instead of docker daemon in integration-cli
...
Updating `integration-cli/daemon.go` to use `dockerd` instead of `docker
daemon` to start up the daemon.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f87053b9c387a5a577383c758dc901cb8bf539e2
Component: engine
2016-05-26 13:14:35 +02:00
6717a252a9
Fix building image error if bridge network is disabled
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: a8d013495c479cdc18fa7751413ef67334f37ee6
Component: engine
2016-05-24 16:20:26 +08:00
ff692d79a4
Merge pull request #21599 from tonistiigi/separate-daemon-exec-root
...
Use separate exec-root for test daemons
Upstream-commit: d33480474f33523743ae49c1b96737fbfbeb1a6f
Component: engine
2016-03-29 07:52:18 -07:00
40995de161
Use separate exec-root for test daemons
...
Fixes #21545
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0d9b94c4c5d6b4f03a7a86e731e4110e9f27a51e
Component: engine
2016-03-28 17:38:14 -07:00
7665d0c146
integration-cli: exit early if daemon immedately crashed
...
this reduces execution of TestInfoDiscoveryInvalidAdvertise from 11s to 0.2s
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 0f217cead8260ab45f9749074d954e5e9e76187b
Component: engine
2016-03-27 21:57:32 -07:00
ce07920e99
Add docker- prefix to runc and containerd binaries
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 009399dc8ed8a4b635b0e229bf07b685e286d8d9
Component: engine
2016-03-23 00:52:16 -04:00
8ba16d91c8
Replace execdrivers with containerd implementation
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 9c4570a958df42d1ad19364b1a8da55b891d850a
Component: engine
2016-03-18 13:38:32 -07:00
b84fcf00c1
integration-cli: move daemon stuff to its own file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 9a9e2bb61d2c0a5bda75ea5679919162f53f3297
Component: engine
2016-03-04 09:29:24 +01:00