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
Paul Bellamy