Tom Wilkie
958a3bbd99
Use test script from tools.git
2015-09-30 07:42:43 +00:00
Tom Wilkie
50cd716220
Review feedback.
2015-09-29 07:46:00 +00:00
Tom Wilkie
8ee409d9bd
Run tests in a separate container.
2015-09-25 06:19:00 +00:00
Bryan Boreham
3a79be7426
Add smoke-test for subdomains
2015-09-24 14:48:39 +01:00
Tom Wilkie
b31eb3db82
Merge remote-tracking branch 'upstream/1.1'
2015-09-24 03:54:09 +00:00
Tom Wilkie
011f96c6a7
New test image using docker 1.8
2015-09-24 03:42:44 +00:00
Tom Wilkie
c7b4136d31
Update for docker/machine PR #1729
2015-09-24 03:25:30 +00:00
Bryan Boreham
da2f98fa8f
Remove workaround for upstream, no longer required
2015-09-23 10:15:06 +01:00
Tom Wilkie
7ac532a1d0
Merge pull request #1454 from weaveworks/1433-docker-1.8
...
New test image using docker 1.8
2015-09-23 10:16:06 +08:00
Paul Bellamy
3e4d8a3ffe
review feedback
2015-09-22 15:09:32 +01:00
Paul Bellamy
74c3b0d079
[proxy] Override sneaky /start HostConfig params
2015-09-22 15:09:32 +01:00
Paul Bellamy
846aa98a9c
renaming test so it runs
2015-09-22 14:52:28 +01:00
Tom Wilkie
6e06ce2af1
New test image using docker 1.8
2015-09-22 05:31:26 +00:00
Matthias Radestock
3c266dce8c
Merge branch '1.1'
2015-09-15 15:51:36 +01:00
Adam Harrison
bbf7646751
Update docker repo, keys and package name
2015-09-15 11:33:53 +01:00
Paul Bellamy
e39974eb07
Merge pull request #1210 from weaveworks/401-proxy-start-events
...
make proxy attach network on docker start event
2015-09-15 10:18:48 +01:00
Adam Harrison
2ffe9b53f7
Merge branch '1.1'
2015-09-14 14:21:36 +01:00
Matthias Radestock
f7dfe9dd23
always arp_update new addresses in 'attach'
...
Previously we'd only do that when the container had no ethwe at the
start. Therefore adding a recycled IP address to an already attached
container would not send out an arp update for that IP, which would
break connectivity to that IP for containers which had previously
accessed that IP.
Fixes #1405 .
2015-09-10 18:43:49 +01:00
Matthias Radestock
aa61cbd574
Merge pull request #1388 from weaveworks/alpine
...
gliderlabs/alpine is now just alpine
2015-09-08 14:01:40 +01:00
Alfonso Acosta
ce5dd847e9
[proxy] Add --hostname-from-label
...
This allows registering container hostnames based on a label provided when
creating the container.
2015-09-04 17:02:07 +01:00
Paul Bellamy
e74b6cbcaf
gliderlabs/alpine is now just alpine
2015-09-04 14:33:18 +01:00
Paul Bellamy
e21a204eed
[proxy] add --rewrite-inspect flag
...
To return the weave ip/mac for docker inspect calls.
2015-09-04 13:40:06 +01:00
Adam Harrison
0125e67b35
Implement smoke test
2015-09-03 09:59:37 +01:00
Bryan Boreham
b712ba1e04
Extend test to cover containers restarting automatically
2015-09-01 17:48:22 +01:00
Paul Bellamy
a23c0237c3
using --collect-only so we don't miss tests
2015-09-01 10:50:13 +01:00
Bryan Boreham
176ee73efe
Ensure we have the busybox image
2015-08-28 20:34:43 +01:00
Bryan Boreham
54833195ed
Call to docker-py changed upstream
2015-08-28 20:34:43 +01:00
Bryan Boreham
a45e5ac152
Test calling 'start' with a HOST_CONFIG not supplied to 'create'
2015-08-28 16:20:31 +01:00
Tom Wilkie
42b64f826b
Merge pull request #1358 from weaveworks/1357-dns-reverse-tombstone
...
Make reverse dns lookups honor tombstones.
2015-08-27 14:25:23 +01:00
Bryan Boreham
5289a380f2
Use $* instead of $@ to get the desired quoting
2015-08-26 12:31:38 +01:00
Tom Wilkie
914c88454d
Review feedback
2015-08-25 16:53:21 +00:00
Tom Wilkie
46363f4129
Make reverse dns lookups honor tombstones.
2015-08-25 12:01:09 +00:00
Tom Wilkie
8516ab7c69
Unify logic to tell if DNS response is too big.
2015-08-21 12:39:12 +00:00
Bryan Boreham
4d49bf3ab9
Add comment to clarify the reason why there is no explicit 'assert' test at the end.
2015-08-19 16:54:24 +01:00
Paul Bellamy
0de292c0d4
[proxy] attach containers with --net=none to weave
2015-08-14 13:48:32 +01:00
Matthias Radestock
eaa5385069
refactor: use new proxy_start_container function
2015-08-13 19:54:00 +01:00
Matthias Radestock
fa2aa1f791
Merge branch '1.0'
...
Conflicts:
test/640_proxy_restart_reattaches_test.sh
2015-08-13 19:46:23 +01:00
Matthias Radestock
65578211ef
extract test functions for "start container via proxy"
...
This also eliminates the redefinition of 'start_container' by some of
the tests, which causes failures when multiple tests are run with
`run_all.sh`.
Fixes #1294 .
2015-08-13 15:01:15 +01:00
Matthias Radestock
78df99e7e7
Merge branch '1.0'
2015-08-13 14:37:31 +01:00
Matthias Radestock
90ed76853c
fix test breakage
...
on master, and only when running via `run_all.sh`. Weird.
2015-08-13 14:36:30 +01:00
Matthias Radestock
26f4a41900
Merge branch '1.0'
2015-08-13 14:07:22 +01:00
Matthias Radestock
a3b4d6cdbf
consistency: use $SMALL_IMAGE instead of $BASE_IMAGE
...
whenever possible
2015-08-13 14:06:43 +01:00
Matthias Radestock
686500b181
Merge branch '1.0'
2015-08-13 14:05:35 +01:00
Matthias Radestock
84c5c52090
fix broken test silliness
2015-08-13 14:05:17 +01:00
Matthias Radestock
d5de0b41f9
Merge branch '1.0'
...
Conflicts:
proxy/proxy.go
2015-08-13 13:57:02 +01:00
Matthias Radestock
bd41d114b5
Merge pull request #1291 from weaveworks/docker-1.8
...
Docker 1.8 compatibility.
Fixes #1287 .
2015-08-13 13:53:03 +01:00
Matthias Radestock
94d2f84364
refactor: use proxy abstraction
2015-08-13 13:50:29 +01:00
Paul Bellamy
bf2b456af1
Don't use .Volumes in tests, as it's gone in docker 1.8
2015-08-13 13:36:47 +01:00
Paul Bellamy
2576e819a7
Revert "fix intermittent test failure"
...
This reverts commit e2fec3d007
2015-08-13 11:12:50 +01:00
Paul Bellamy
e2fec3d007
fix intermittent test failure
...
Tests were running in the same shell, so function definitions were
leaking between tests.
2015-08-12 11:14:51 +01:00
Tom Wilkie