Raj Chaudhuri
e50040883f
Docker API client version bumped to 1.24 everywhere
2024-03-07 19:27:12 +05:30
Matthias Radestock
c25bfafcb2
refactor: make proxy log via a package-local var
...
which gets rid of a bunch of (dot) imports.
2016-03-20 08:31:23 +00:00
Paul Bellamy
fbb2c213a9
[proxy] all request modification is done through map[string]interface{}
...
That way we are less likely fall victim to go-dockerclient, or the API changing.
2015-10-12 15:53:07 +01:00
Paul Bellamy
19ceb424c3
[proxy] refactoring out common marshalling logic
2015-09-04 13:40:07 +01:00
Matthias Radestock
8960a3a898
Merge branch '1.0'
...
Conflicts:
proxy/create_exec_interceptor.go
test/600_proxy_docker_py_test.sh
2015-08-28 20:29:43 +01:00
Matthias Radestock
24de98e188
refactor
2015-08-28 18:08:24 +01:00
Paul Bellamy
6b5f35e574
[proxy] Only replace the request body if we've modified it.
...
This is a temporary fix for a failure in docker-py tests:
"test_valid_no_config_specified".
2015-08-28 15:09:33 +01:00
Bryan Boreham
3d25620d13
In proxy, rewrite /etc/hosts from 'weave attach', via new utility weavehosts
2015-08-27 15:03:41 +01:00
Bryan Boreham
6e89b036e2
Wait for ethwe via netlink, not via polling or signals
...
('docker kill' breaks restart policy)
2015-08-27 15:03:41 +01:00
Matthias Radestock
375af0a7b9
Improve log messages for when the proxy ignores a container
...
- 'ignoring' could be misread as 'dropped request', so change that to
'leaving container alone'
- more elaborate reasons
2015-08-17 16:15:45 +01:00
Paul Bellamy
a0876becbc
Merge remote-tracking branch 'upstream/1.0'
...
Conflicts:
proxy/create_container_interceptor.go
proxy/create_exec_interceptor.go
proxy/proxy.go
proxy/start_container_interceptor.go
2015-07-16 15:29:29 +01:00
Paul Bellamy
c6fa9cb17e
refactor weaveCIDRsFromConfig to return an error message
2015-07-16 15:15:32 +01:00
Paul Bellamy
1132d26d47
[proxy] do not weave attach containers in '--net=host|container:<name|id>'
2015-07-16 13:58:27 +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
Bryan Boreham
a5ddb63fca
Remove Info.Print in favour of Log.Info
2015-07-01 14:01:45 +01:00
Paul Bellamy
6c26a55b5a
[proxy] refactor weaveCIDRsFromConfig slightly
2015-06-17 14:51:12 +01:00
Paul Bellamy
ca681bce13
[proxy] Add support for WEAVE_CIDR=none
...
Tells the proxy not to do anything with this container. We set it when
running weaveexec/weave/etc containers, so that the weave script works
through the proxy.
2015-06-17 14:51:12 +01:00
Paul Bellamy
220c80c3ed
[proxy] --with-ipam -> --no-default-ipam
2015-06-17 11:31:33 +01:00
Matthias Radestock
5c70c7c71a
simplify interceptor structs by referencing proxy
2015-06-09 14:45:50 +01:00
Paul Bellamy
e2447721eb
[proxy] We can only rely on receiving a signal when we are a container
...
Due to https://github.com/docker/docker/issues/9098 , there is no way to
signal an exec. Instead we'll have to just poll the interface and hope.
Adds `weavewait -s` which is the way to tell weavewait to skip waiting
for a signal, which we use on execs
2015-06-02 17:21:41 +01:00
Matthias Radestock
9c71f7f1e9
cosmetic: remove some more dead code
2015-05-28 15:23:34 +01:00
Paul Bellamy
cb73b73862
Fix bug of --with-ipam not setting entrypoints
2015-05-27 13:38:28 +01:00
Matthias Radestock
f7f0369bff
improve logging in proxy
...
- always info-log when we encounter an 'interesting' container
- s/CIDR/WEAVE_CIDR
- some other minor tweaks
2015-05-19 19:46:53 +01:00
Paul Bellamy
e6b587ea8d
proxy needs to add weavewait to execs as well
...
Bug came up in a test where we are restarting and doing an exec checking
a network interface right away. weavewait is only added if the container
has a WEAVE_CIDR var set, the same as at container creation.
2015-05-19 17:36:53 +01:00
Raj Chaudhuri