Bryan Boreham
0613a06653
IPAM: handle multiple CIDRs in weave script
2015-06-10 17:21:16 +01:00
Bryan Boreham
2553850ed4
Initial implementation of multi-subnet IPAM
2015-06-10 17:21:16 +01:00
Bryan Boreham
ae8985deb5
Merge pull request #884 from rade/881_get_container_id_on_start
...
LGTM. Fixes #881
2015-06-10 17:20:25 +01:00
Paul Bellamy
2d5e362115
[proxy] use logs for getting proxy-env and proxy-config
...
It's ugly, but beats arg-parsing, inspecting the container and piecing
the address together from exposed ports.
We could just use the host from DOCKER_HOST, but that will fail in the
case of a host with multiple IPs, where the proxy only listens on one.
2015-06-10 15:24:53 +01:00
Matthias Radestock
7a2b5c43e7
feed full container id on weave start to DNS/IPAM
...
We erroneously assumed that `docker start` returned the full container
id. It doesn't and as a result we populated DNS with records with ids
other than full container ids. And that's also what we told IPAM. As a
result, DNS and IPAM didn't clean up after the container's death,
resulting in stale DNS entries and leaked IPs.
Fixes #881 .
2015-06-10 14:53:43 +01:00
Paul Bellamy
6bb087cecd
[proxy] Renaming flags: -H -> -D, -L -> -H
...
As per discussion in issue 875
2015-06-10 12:13:52 +01:00
Paul Bellamy
447a00ba7e
[proxy] Add support for tcp:// prefix on listen addresses
2015-06-10 12:13:52 +01:00
Paul Bellamy
0da9669e5c
[proxy] removing unneeded port expose
2015-06-10 12:13:51 +01:00
Paul Bellamy
4a7d4d3555
[proxy] documenting -L option
2015-06-10 12:13:51 +01:00
Matthias Radestock
fee2898c05
remove detailed proxy status
...
There are two problems with obtaining the proxy status via the normal
proxy endpoint...
1. when TLS is enabled, this requires using TLS at the client end
2. the status URL is mixed in with the docker remote API, which is
rather unclean
There is limited value to having some status output from the proxy,
since all the output is constant.
So instead we log the version and command line args, and in `weave
status` only report whether the proxy is running.
We still want a way to wait for the proxy to start up, and log a nice
error if it dies. We do this by polling the docker logs for a startup
message.
Fixes #877 . Fixes #876 .
Undoes most of #756 , #800 , #854 .
2015-06-09 14:03:52 +01:00
Matthias Radestock
2d70197221
cosmetic: more formal command grammar
2015-06-08 23:57:53 +01:00
Matthias Radestock
3f274d02ce
make weave launch args insensitive to order
...
Fixes #816 .
2015-06-08 12:41:26 +01:00
Matthias Radestock
8f85a07ecc
introduce '-nodiscovery' option to disable automatic peer discovery
...
Closes #847 .
2015-06-05 15:13:48 +01:00
Matthias Radestock
87e30d8382
Merge pull request #815 from paulbellamy/proxy-ssl
...
Proxy TLS Support
Closes #506 .
2015-06-05 14:48:54 +01:00
Paul Bellamy
14cc33c512
reordering args to launch-proxy docker command
2015-06-05 14:10:38 +01:00
Paul Bellamy
bddf79855d
[proxy] refactor tls arg parsing
2015-06-05 13:59:30 +01:00
Matthias Radestock
3e8813e559
Merge pull request #858 from weaveworks/0.11
...
Respect `DOCKER_CLIENT_ARGS` in `weave run`
2015-06-05 13:36:27 +01:00
Ilya Dmitrichenko
e1537000c2
Respect DOCKER_CLIENT_ARGS in weave run ( close #855 )
2015-06-05 13:24:05 +01:00
Paul Bellamy
c31358259f
[proxy] Add tls support
...
Caveats:
* TLS files must be present on the target server (and readable)
* TLS file paths cannot contain spaces
* TLS file paths must be absolute (i.e. cannot be relative)
* Bash argument parsing is terrible
2015-06-05 13:23:14 +01:00
Matthias Radestock
dc8a82e913
cosmetic: consistency in launchers
2015-06-03 14:22:20 +01:00
Paul Bellamy
c91e699a27
Merge pull request #831 from rade/192_kill_container_on_network_config_error
...
kill container on network config error
2015-06-03 12:45:23 +01:00
Matthias Radestock
4e68bde7b5
don't time out waiting for weave infrastructure containers to start
...
instead keep trying, until we succeed or the container dies
Fixes #666 .
2015-06-03 11:19:51 +01:00
Matthias Radestock
fa8b77b060
kill -0 $CONTAINER_PID does not work inside weaveexec container
...
since $CONTAINER_PID is in a different process namespace.
Fixes #829 .
2015-06-03 11:16:08 +01:00
Matthias Radestock
83fe4e59f6
kill container on network config error
...
but only if we have just started it; killing other containers, e.g. on
`weave attach`, would be rather impolite.
Closes #192 .
2015-06-02 20:26:20 +01:00
Matthias Radestock
8de1ddd255
cosmetic
2015-06-02 20:21:56 +01:00
Matthias Radestock
395aea28c6
cosmetic
2015-06-02 20:16:25 +01:00
Matthias Radestock
d020999e82
cosmetic: more sensible function order
2015-06-02 17:52:39 +01:00
Matthias Radestock
48b54ef722
cosmetic: consistency
2015-06-02 17:25:56 +01:00
Bryan Boreham
aa7c7a9a9d
Add --no-trunc flag to docker ps for ipam_claim
2015-06-02 16:07:48 +01:00
Matthias Radestock
e2805c01f4
cosmetic: remove stray trailing whitespace
2015-06-02 15:57:50 +01:00
Paul Bellamy
91375a1095
Revert "First pass at Proxy SSL Support"
2015-06-02 12:48:38 +01:00
Paul Bellamy
3586ddcd63
Merge pull request #813 from paulbellamy/proxy-ssl
...
First pass at Proxy SSL Support
2015-06-02 12:48:31 +01:00
Matthias Radestock
294aafde14
cosmetic: s/when_has_fqdn/with_container_fqdn
2015-06-02 10:52:58 +01:00
Matthias Radestock
dcedf241bb
simplify dns-add/remove
2015-06-02 10:52:58 +01:00
Matthias Radestock
bf8e82ba16
refactor: get rid of with_full_container_id
2015-06-02 10:52:58 +01:00
Paul Bellamy
79cc2d6d25
add note about not handling args with spaces for proxy tls files
2015-06-02 10:20:06 +01:00
Adam Harrison
9da5511484
Support -h argument to dns-remove
2015-06-02 09:57:28 +01:00
Paul Bellamy
d80ffa8ad2
working on bash argument parsing
2015-06-01 16:50:52 +01:00
Paul Bellamy
74afbc5505
Proof-of-Concept for proxy TLS support
...
The code is quite messy, but particularly the argument parsing and
volume-mounting. Also, it doesn't support args with spaces, or
non-absolute file-paths.
2015-06-01 16:50:52 +01:00
Paul Bellamy
4e1d388017
weave status should look for proxy at 127.0.0.1 (since PROXY_HOST is gone)
2015-06-01 12:21:58 +01:00
Paul Bellamy
bd94c00e96
weave PROXY_HOST is always localhost, so just hardcode it as that
...
Because launch-proxy runs in weaveexec container, DOCKER_HOST is never
set.
2015-06-01 11:51:32 +01:00
Matthias Radestock
21ee0fdcf7
Merge branch '0.11'
2015-05-31 11:54:54 +01:00
Matthias Radestock
5f385a297c
remove bashism
...
This was introduced in #780 .
2015-05-31 11:51:34 +01:00
Matthias Radestock
8d0adb9359
refactor(ish): use full container id when we have it
2015-05-31 11:25:13 +01:00
Matthias Radestock
79eb4c298c
refactor: extract helper for and simplify get_ipam_cidr
2015-05-31 09:59:32 +01:00
Matthias Radestock
6f57bcb477
tiny refactor - use full container id, since we happen to have it
2015-05-31 09:35:53 +01:00
Matthias Radestock
59fd53ee99
Merge pull request #800 from paulbellamy/proxy-status
...
Add proxy info to 'weave status' output
Closes #756 .
2015-05-29 17:13:33 +01:00
Paul Bellamy
7f62ba6ebe
Add proxy info to './weave status' output
2015-05-29 17:05:25 +01:00
Matthias Radestock
b7df116491
make weave reset stop the proxy
...
Missed this in #790 .
2015-05-29 16:43:18 +01:00
Paul Bellamy
2be69634df
replace proxy /weave endpoint with /status
...
which is more standard with others, and doesn't conflict with docker api
2015-05-29 15:48:33 +01:00