Matthias Radestock
a2ff7e5981
Merge pull request #1919 from weaveworks/issues/1900-dont-stop-stoppin
...
Warn, don't error, if unable to remove network in 'weave stop'
Fixes #1900 .
2016-01-21 11:22:21 +00:00
Bryan Boreham
e47360f8dc
Warn, don't error, if unable to remove network in 'weave stop'
2016-01-20 16:18:09 +00:00
Adam Harrison
14944da396
Ignore stderr in proxy_addrs
2016-01-20 14:24:59 +00:00
Bryan Boreham
b055c9a4a2
Fool-proofing
2016-01-13 10:33:49 +00:00
Bryan Boreham
3daceac668
Allow pre-existing plugin on 'weave launch-plugin'
2016-01-13 10:05:02 +00:00
Bryan Boreham
517a2e0e0a
Fix nonzero exit code for a pre-existing plugin on launch;
...
do this purely for the 'plugin running' case, not 'restarting' etc.
2016-01-12 17:06:38 +00:00
Bryan Boreham
bb8c7c599c
Revert "don't launch anything when plugin is running"
...
This reverts commit 3ade796e8d .
2016-01-12 16:51:49 +00:00
Matthias Radestock
e4295a2da9
don't attach rewrite_etc_hosts helper container to weave
...
...since that is a) inefficent and b) can block when IPAM hasn't had
consensus.
We can only end up in this situation when DOCKER_HOST is pointing at
the weave proxy and we are running `weave run|attach` with
`--local`. So it's very much an edge case.
Fixes #1858 .
2016-01-07 14:32:52 +00:00
Matthias Radestock
216a0fe4fc
refactor: WEAVE_CIDR=none is redundant when --net=host
2016-01-07 14:29:51 +00:00
Matthias Radestock
80770d39e5
oops
2016-01-04 10:53:41 +00:00
Matthias Radestock
beb15fa32c
don't fail weave launch when plugin is disabled
...
Fixes #1851 .
2016-01-04 10:35:44 +00:00
Matthias Radestock
7660ad761a
oops
...
I broke this in 370212609 .
Fixes #1848 .
2016-01-03 16:42:39 +00:00
Matthias Radestock
c8ff2de3b3
properly deal with unavailable docker server api version
...
Fixes #1845 .
2015-12-31 12:51:16 +00:00
Matthias Radestock
24a2e43547
Merge pull request #1841 from weaveworks/1840-weave-stop-plugin-complaint
...
don't complain in `weave stop` when plugin is not enabled
Fixes #1840 .
2015-12-31 12:32:05 +00:00
Matthias Radestock
a9d212c888
don't fail on missing docker_tls_args
...
instead just don't auto-detect TLS args in that case.
This makes `weave --local launch` work (again).
Fixes #1844 .
2015-12-31 10:43:46 +00:00
Matthias Radestock
c1b1276aaf
refactor: simplify
2015-12-31 10:16:37 +00:00
Matthias Radestock
370212609c
Show expected error message when docker_tls_args fails.
...
And also make the error message more meaningful.
Fixes #1843 .
2015-12-31 10:05:41 +00:00
Matthias Radestock
281937cf82
document weave launch-router --trusted-subnets
...
and eliminate duplication
Fixes #1842 .
2015-12-31 01:09:51 +00:00
Matthias Radestock
d11b6e8075
don't complain in weave stop when plugin is not enabled
2015-12-30 23:40:27 +00:00
Matthias Radestock
c7c669fd11
make eval $(weave env) idempotent
...
so that `weave $(env --restore)` does the right thing regardless of
how many times `eval $(weave env)` was invoked previously.
Fixes #1824 .
2015-12-23 09:08:56 +00:00
Bryan Boreham
800f4663b6
Only pass through $DOCKER_HOST in exec_remote() if it is a Unix socket;
...
a TCP socket may be secured by TLS, in which case we can't use it.
2015-12-22 17:01:04 +00:00
Matthias Radestock
b1b62afa90
Merge pull request #1812 from weaveworks/1810-warn-with-dns
...
Issue a warning on --with-dns option to proxy, because it was removed
Fixes #1810
2015-12-22 15:12:27 +00:00
Bryan Boreham
6b90ef7078
Clarify message
2015-12-22 14:56:40 +00:00
Matthias Radestock
2ed4b45c24
Merge pull request #1817 from weaveworks/1815-docker-version
...
Check we have Docker 1.9 or newer before trying to remove a network
Fixes #1815 .
2015-12-22 14:01:55 +00:00
Matthias Radestock
47ba9748b4
Merge pull request #1814 from weaveworks/1778-check-running
...
Handle weave containers in 'restarting' state
Fixes #1778 .
2015-12-22 13:49:19 +00:00
Bryan Boreham
077ad4208f
Merge pull request #1813 from weaveworks/1797-plugin-version
...
Show plugin version; Fixes #1797
2015-12-22 13:12:38 +00:00
Bryan Boreham
c19edec364
Add 'weave stop-xxx' instructions for 'already running' case
2015-12-22 13:04:06 +00:00
Bryan Boreham
0c2aa494ae
Reduce duplication
2015-12-22 13:03:04 +00:00
Bryan Boreham
73e0a6bb0a
Inform user about weave containers in state 'restarting'
2015-12-22 13:01:00 +00:00
Bryan Boreham
abf1db0045
Merge pull request #1819 from weaveworks/1818-dont-launch-when-plugin-running
...
don't launch anything when plugin is running; fixes #1818 . LGTM.
2015-12-22 12:55:57 +00:00
Matthias Radestock
b40b78ece0
refactor docker_sock_volume_mount()
2015-12-22 12:47:36 +00:00
Matthias Radestock
3ade796e8d
don't launch anything when plugin is running
...
...just as we don't launch anything if either the router or proxy are
running.
Fixes #1818 .
2015-12-22 12:30:53 +00:00
Bryan Boreham
7c2e808924
Check we have Docker 1.9 or newer before trying to remove a network
2015-12-22 12:10:48 +00:00
Bryan Boreham
7d2227c5a4
Add plugin version to 'weave version'
2015-12-22 10:50:02 +00:00
Bryan Boreham
8a517d5c7c
Issue a warning on --with-dns option to proxy, because it was removed
2015-12-22 10:00:06 +00:00
Bryan Boreham
4ebb13fa94
Fix indentation of netcheck if-statement
2015-12-17 16:23:42 +00:00
Bryan Boreham
ecf4a82b99
Warn user if weave network is in use on stop or reset
2015-12-17 10:05:36 +00:00
Adam Harrison
7015ab8717
Merge pull request #1780 from weaveworks/1748-no-with-dns
...
Remove WITH_DNS variable from weave script
2015-12-16 15:59:24 +00:00
Bryan Boreham
67195bc9f3
Remove WITH_DNS variable and deprecate --with-dns option to 'weave run'
2015-12-16 14:55:35 +00:00
Adam Harrison
ce18509aa7
Merge pull request #1781 from weaveworks/1754-no-with-dns
...
Remove --with-dns option from proxy
2015-12-16 14:02:30 +00:00
Bryan Boreham
afcb84d42c
Set up static route for multicast, with option to turn off
2015-12-16 12:17:25 +00:00
Bryan Boreham
85c9cf43f7
Merge pull request #1689 from weaveworks/1586-alternate-docker-sock
...
Support weave script running against non-standard DOCKER_HOST.
2015-12-16 10:35:46 +00:00
Adam Harrison
ce90d2389b
Merge pull request #1790 from weaveworks/1783-veth-name
...
Prefix interface names with 'veth' so NetworkManager ignores them
2015-12-16 10:34:32 +00:00
Bryan Boreham
1a1d8b7c74
Prefix interface names with 'veth' so NetworkManager ignores them
2015-12-16 10:01:57 +00:00
Paul Bellamy
f28ad350bd
make weave and the proxy work with tcp-only dockers via DOCKER_HOST
2015-12-15 18:02:59 +00:00
Paul Bellamy
0afc3db383
First pass at passing DOCKER_HOST=unix://* through to the weave and proxy
2015-12-15 18:02:27 +00:00
Bryan Boreham
0e9991f7d4
Make plugin create 'weave' network by default
2015-12-15 16:52:37 +00:00
Bryan Boreham
41482aff01
Update plugin README and documentation
2015-12-15 16:52:37 +00:00
Bryan Boreham
b709cdeab5
Create local and global network from the same driver and create local-scope weave network by default on weave launch
2015-12-15 16:47:18 +00:00
Bryan Boreham
e2f936fde3
Rework version check
...
- extract function so we can use the check elsewhere
- use shell variable expansion rather than exec-ing 'cut'
2015-12-15 16:40:43 +00:00