Bryan Boreham
33fb296769
Merge pull request #245 from rade/238_check_docker_version_when_using_dns
...
Looks good to me. Fixes #238
2014-11-28 11:17:13 +00:00
Bryan Boreham
a3482c9f2d
Merge pull request #244 from rade/233_stop_on_docker_run_errors
...
LGTM. Fixes #233
2014-11-28 11:01:51 +00:00
Matthias Radestock
8a6c7f7d22
Merge branch '233_stop_on_docker_run_errors' into 238_check_docker_version_when_using_dns
2014-11-28 10:42:33 +00:00
Matthias Radestock
b18b24b3f3
--version -> -v
2014-11-28 10:40:59 +00:00
Matthias Radestock
cadf348cbd
remove implemented feature from Limitations
...
This should have been part of #200
2014-11-28 10:04:28 +00:00
Matthias Radestock
d707ed5df0
we should never write messages to stdout
2014-11-28 10:00:46 +00:00
Matthias Radestock
fd6f19cc44
check for Docker version >= 1.2.0 when using "--with-dns"
...
since --dns-search=. is is new in that version
2014-11-28 09:10:14 +00:00
Matthias Radestock
f6f1916c39
Merge branch '233_stop_on_docker_run_errors' into 238_check_docker_version_when_using_dns
2014-11-28 08:53:02 +00:00
Matthias Radestock
2da534445a
stop on 'docker run' errors
...
This broke due to our workaround for
https://github.com/docker/docker/issues/8632 , which affects Docker
version 1.3.0 only, so now we refuse to run with that.
2014-11-28 00:57:49 +00:00
Matthias Radestock
010d488ad7
refactor: simplify regexp
2014-11-27 17:32:44 +00:00
Matthias Radestock
65c77df279
less noise
2014-11-27 15:27:59 +00:00
Matthias Radestock
625df2e7d5
refactor(ish): move veth creation into one place
...
This simplifies the code, but means we do end up invoking ethtool on
the weave container's ethwe, which isn't necessary but harmless.
2014-11-27 11:11:29 +00:00
Matthias Radestock
29b3db6c05
run ethtool outside container netns
...
We want to run as little as possible inside the container netns.
Unfortunately we cannot make that change for the weave container,
since the interface on which we need to invoke ethtool is created by
docker and already inside the container netns by the time we get
control.
2014-11-27 10:20:25 +00:00
Matthias Radestock
1ba1f63776
refactor
2014-11-27 10:07:30 +00:00
Matthias Radestock
d9ea3b44a1
always mark the interface as 'up' last
...
since that kinda acts as a marker that everything is ready
2014-11-27 09:56:12 +00:00
Matthias Radestock
8fac46a429
refactor: introduce a helper
2014-11-27 09:39:47 +00:00
Matthias Radestock
ed1db251d8
even better comment
2014-11-27 08:45:49 +00:00
Matthias Radestock
c8ecfec211
correct comment
2014-11-27 08:42:27 +00:00
Bryan Boreham
28a9d86c7e
Merge pull request #200 from squaremo/issue195_populate_dns_on_start
...
LGTM. Fixes #195 (apart from part 3)
2014-11-26 15:12:08 +00:00
Michael Bridgen
b3d19d6e9d
Wait for weaveDNS HTTP to be running before sending it names
...
This adds a no-op endpoint to the HTTP API at `/status`. The script
simply tries this until it succeeds or gets bored.
2014-11-26 14:18:26 +00:00
Michael Bridgen
6a076d05b0
Only get the DNS container IP once
...
`populate_dns` previously used http_call, which looks up the IP for a
container each time. I've factored the HTTP bit after the IP look-up
in http_call out, so it can be used directly. This involved switching
arguments around to make the tail call easier.
2014-11-26 14:18:26 +00:00
Michael Bridgen
3d8249b4c3
Populate DNS when starting the weaveDNS container
2014-11-26 14:18:26 +00:00
Bryan Boreham
235d620f55
Merge pull request #239 from squaremo/issue201_use_bridge_ip
...
LGTM. Fixes #201
2014-11-26 14:12:02 +00:00
Michael Bridgen
2534977f99
Make weaveDNS use the docker bridge IP instead of its own
...
This means the `--dns` setting for containers will work even if the
weavedns container is restarted (and assigned a new docker network
IP).
2014-11-26 13:16:52 +00:00
Michael Bridgen
6e8060cb7f
Merge branch '208_opt_in' of github.com:bboreham/weave into pr234_with_dns
2014-11-25 14:33:02 +00:00
Bryan Boreham
4046c3a8bc
Undid extra check that there is at least one argument to 'docker run'
2014-11-25 14:13:40 +00:00
Bryan Boreham
0b051db5e1
Simplify arg parsing on weave run
2014-11-25 14:09:26 +00:00
David Wragg
00cd84868f
Merge PR #231 : Improve kernel version matcher
...
Fixes issue #185
2014-11-25 11:58:49 +00:00
Ilya Dmitrichenko
9280bb8268
Improve kernel version matcher ( close #185 )
2014-11-25 11:51:12 +00:00
Bryan Boreham
19f6c17f69
Two minus signs
2014-11-25 11:01:05 +00:00
Bryan Boreham
42f0cb883a
Add --with-dns option to weave run
2014-11-24 20:14:01 +00:00
Bryan Boreham
5c76411e34
Merge pull request #232 from zettio/revert-211-issue201_use_docker_bridge_ip
...
Revert "Use Docker bridge IP for DNS"
2014-11-24 18:02:53 +00:00
Bryan Boreham
21b190ed41
Revert "Use Docker bridge IP for DNS"
2014-11-24 18:02:11 +00:00
Bryan Boreham
90c04631ec
Merge pull request #211 from squaremo/issue201_use_docker_bridge_ip
...
LGTM. Closes #201
2014-11-24 16:12:31 +00:00
Matthias Radestock
5b6dca6436
building weave requires a recent docker
...
We know for sure it builds with 1.3.0 and not 1.0.1. I can't be
bothered to check every version inbetween, so let's just say we
require 1.3.0.
Closes #220 .
2014-11-23 11:04:45 +00:00
Michael Bridgen
2a8ef7803b
Catch the README up with the change in IP used
2014-11-21 16:23:56 +00:00
Michael Bridgen
95430cb528
Make weaveDNS use the docker bridge IP instead of its own
...
This means the `--dns` setting for containers will work even if the
weavedns container is restarted (and assigned a new docker network
IP).
2014-11-21 16:23:56 +00:00
Bryan Boreham
6d1792ebdf
Add more links to Boot2Docker info
2014-11-21 14:59:06 +00:00
Michael Bridgen
e55a27fb58
Merge branch 'master' of github.com:bboreham/weave into pr213
2014-11-21 14:39:28 +00:00
rade
95ea7cd4c8
Merge pull request #215 from sw1nn/patch-1
...
fix typo
2014-11-21 11:50:19 +00:00
Neale Swinnerton
a411cffe0a
fix typo
2014-11-21 11:16:51 +00:00
Bryan Boreham
5cc24fe55e
Rename 'server' to 'listener' to better match how it is used
2014-11-20 16:37:25 +00:00
Bryan Boreham
22c3ff9f60
Set 'Unsafe' flag to allow dns.Server to handle responses
2014-11-20 16:36:13 +00:00
rade
2f47dbddae
Merge pull request #210 from squaremo/remove_redundant_shellfunc
...
Remove redundant shell function
2014-11-20 14:46:14 +00:00
Michael Bridgen
674da8dafd
Merge branch 'make_tests' of github.com:bboreham/weave into make_tests
2014-11-20 12:20:02 +00:00
Matthias Radestock
f8b7d73dd1
update supported docker version
2014-11-19 19:53:31 +00:00
Michael Bridgen
abba2f6b66
Merge pull request #202 from errordeveloper/issue185_min_kernel_version
...
Add kernel version check and document in README
2014-11-19 16:40:33 +00:00
Bryan Boreham
a5acb5cdd3
Added tests to .PHONY rule
2014-11-19 16:34:39 +00:00
Ilya Dmitrichenko
de09daa331
Document Linux kerenel version requirements
2014-11-19 16:32:49 +00:00
Michael Bridgen
64b20d8f30
Remove redundant shell function
...
This was used before http_call was made, but that function effectively
inlines it.
2014-11-19 16:20:53 +00:00