Bryan Boreham
afac7c4d09
Change test 610 to use a Weaveworks container
...
Previously we used 'alpine' which had no 'CMD' line, but that changed
upstream, so generate our own trivial image for this purpose.
2017-07-13 13:41:53 +00:00
Bryan Boreham
f91a9c2562
Fix test: committed image embeds WEAVE_CIDR
...
so we cannot run two of those containers at the same time.
Fixed by stopping the first one before we start the second.
2017-06-12 14:03:53 +00:00
Marc CARRE
43249a8d39
Change all launch-*/stop-* commands to launch/stop.
...
Given `proxy` & `router` processes have been merged, `launch-proxy`,
`launch-router`, `stop-proxy`, `stop-router` do not make sense any more, and
should just be `launch` and `stop` with the appropriate flags.
2017-05-10 10:25:36 +00:00
Marc CARRE
0dff07dc8b
Scripts now source dependencies using relative paths (previously breaking make depending on current directory).
2016-12-13 16:00:37 +00:00
Matthias Radestock
18c26e9fbb
don't set the interface 'up' before it is fully configured
...
This was causing container entrypoints to execute too early,
e.g. before the interface had been given an IP address. But only when
running with --no-multicast-route, since otherwise weavewait is
waiting for the multicast route to appear.
Fixes #1942 .
2016-02-01 12:04:15 +00: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
f55655216f
[proxy] rewrite /etc/hosts from outside the container
...
Avoids problems when container user is non-root. Added a test for this
and the --no-rewrite-hosts flag.
2015-08-06 13:14:18 +01:00
Paul Bellamy
1d1ebc103d
Merge remote-tracking branch 'upstream/1.0'
2015-08-04 14:29:12 +01:00
Paul Bellamy
7cc53c4c68
[proxy] Handle case where no command is specified.
...
The docker daemon can't do this because we set /w/w.
2015-08-04 12:32:42 +01:00
Paul Bellamy
55051f0194
Merge remote-tracking branch 'upstream/1.0'
2015-07-31 11:01:19 +01:00
Paul Bellamy
4958b8d37a
[proxy] Mount /w from the host for weavewaited containers
...
We set it at container create. Had tried also setting it at start, but
it seems to cause weird behaviour, and there is no way to do it from the
CLI.
2015-07-30 15:11:03 +01:00
Matthias Radestock
3c107d675a
Merge branch '1.0'
2015-07-21 11:42:49 +01:00
Paul Bellamy
aa8466f688
[proxy] Mount weavewait readonly so it can't be tampered with
2015-07-21 11:30:56 +01:00
Matthias Radestock
4d887c8a55
Merge branch '1.0'
...
Conflicts:
proxy/create_exec_interceptor.go
test/610_proxy_wait_for_weave_test.sh
2015-07-15 18:07:11 +01:00
Paul Bellamy
e4422205e8
[proxy] should not attempt weavewait in on weave container's execs
2015-07-15 16:14:14 +01:00
Paul Bellamy
e4458372e8
[proxy] weavewait rewrites /etc/hosts so weave ip is returned first from 'hostname -i'
...
Adds a --no-rewrite-hosts flag to the proxy, and be default, removes the
docker IP from hosts. We only discard the docker host when it exists, so
--net=none works.
2015-07-10 13:57:20 +01:00
Matthias Radestock
ae8172ec97
simplify docker image removal
2015-06-23 14:39:29 +01:00
Paul Bellamy
34aa2e32d8
[proxy] Only prepend weavewait if not already present
...
This way `docker commit` will not stack up weavewaits.
2015-06-22 15:24:49 +01:00
Matthias Radestock
e950d37ed2
cosmetic: reduce noise
2015-05-28 06:31:05 +01:00
Paul Bellamy
73071f2c62
cleanup proxy test helpers
2015-05-22 10:04:09 +01:00
Paul Bellamy
eeaa6c9e2c
use grep in /sys to verify ethwe is up in tests
...
Closes #707 . `ip link show` seems to "lag" the real state. In tests
checking the physical link state is good enough.
2015-05-20 13:36:36 +01:00
Paul Bellamy
1e7c82bb58
use busybox instead of ubuntu for proxy image pulling test
...
busybox is smaller. gliderlabs/alpine is even smaller, but is used by
weaveexec, so we can't remove it.
2015-05-19 10:34:46 +01:00
Paul Bellamy
5a6a67f632
Add integration test for the proxy, using docker-py client
2015-05-19 10:34:45 +01:00
Bryan Boreham