Matthias Radestock
fda412a151
refactor: rename badly named function
...
makeAddressReply handles both A and AAAA records
2014-11-17 12:06:06 +00:00
rade
3cc7b383ad
Merge pull request #184 from bboreham/182_unstable_connections
...
Extra check for duplicate connection
Fixes #182 .
2014-11-14 14:46:46 +00:00
Ilya Dmitrichenko
5104baf953
Merge pull request #180 from squaremo/issue176_move_ghpages_to_master
...
Move gh-pages to master
2014-11-14 14:35:59 +00:00
Bryan Boreham
997e6ed2b9
squash two ifs together
2014-11-14 14:28:45 +00:00
Michael Bridgen
04ed4aef6c
Script to publish gh-pages to site
...
Ideally to be used after merging changes from master with
`./bin/merge-into-gh-pages`
2014-11-14 14:08:45 +00:00
Bryan Boreham
57aecb868f
Add check during initial handshake whether we already have an established connection to this peer
2014-11-14 14:02:33 +00:00
Michael Bridgen
1026342993
Lowercase weave for consistency
2014-11-14 14:02:26 +00:00
Michael Bridgen
eeff76dbd7
Script to merge master/site into gh-pages
2014-11-14 14:00:22 +00:00
Michael Bridgen
a1badfccc7
Put gh-pages branch in site/
...
git read-tree -u --prefix=site/ gh-pages
This is so we can work on code and docs at the same time.
2014-11-14 11:55:07 +00:00
Matthias Radestock
f9f29bbe42
refactor: reduce indent
2014-11-12 19:24:06 +00:00
Matthias Radestock
3269d91b7c
Merge remote-tracking branch 'upstream/master'
2014-11-12 08:44:54 +00:00
Matthias Radestock
58efafd44e
add explanation for why we don't use async send
2014-11-12 08:26:44 +00:00
Michael Bridgen
418578a986
Merge pull request #175 from squaremo/issue172_dns_search
...
Supply a --dns-search to blank the inherited resolv.conf search
(fixes #172 )
2014-11-11 15:46:52 +00:00
Michael Bridgen
a61080e025
Supply a --dns-search to blank the inherited resolv.conf search
...
In the absence of *either* a `--dns` or `--dns-search` argument,
Docker will write a `/etc/resolv.conf` based on the host's. Since, in
general, we rely on the DNS search path being empty (so that the
resolver uses the local domain), we want to blank the
`/etc/resolv.conf` by providing `--dns-search=.` when running a
container.
However, if there's a `--dns-search=` in the remainder of the args,
Docker will append them to the dot, which breaks resolution. Not good.
So, we only "blank" the search path if there's no `--dns-search`
argument present already.
2014-11-11 15:23:06 +00:00
Matthias Radestock
a34e214201
expose DNS port via Dockerfile rather than 'docker run' argument
...
That is "the Docker way".
Related to #141 .
2014-11-11 12:52:17 +00:00
Bryan Boreham
30143d4d6c
Merge pull request #173 from rade/141_dns_without_icc
...
LGTM. Closes #141
2014-11-11 10:50:56 +00:00
Matthias Radestock
2fb79da625
make DNS work when docker is running with --icc=false
...
1) expose the DNS port from the weavedns container
2) link all application containers to the weavedns container
2014-11-08 15:34:23 +00:00
Michael Bridgen
34022ce2fc
Link to weaveDNS review in README
2014-11-07 15:33:30 +00:00
Matthias Radestock
9c620e81d6
kill dns container on weave stop
...
since just running `docker rm -f` has a nasty habit of getting stuck
sometimes.
2014-11-07 12:27:34 +00:00
Matthias Radestock
2fd9b91fc1
remove weavedns container on weave reset
...
(and some cosmetics)
Fixes #171
2014-11-06 22:38:07 +00:00
Matthias Radestock
66ac78ccc0
improve docs: provide some clue for the weavedns cidr
2014-11-06 22:27:20 +00:00
Matthias Radestock
8c3db12081
clarity
2014-11-06 22:18:29 +00:00
Matthias Radestock
f7c1c2a1e0
simplify
2014-11-06 22:17:49 +00:00
Matthias Radestock
0fb8d3d054
fix another typo
2014-11-06 22:15:51 +00:00
Matthias Radestock
9d36bb3289
fix typo
2014-11-06 22:14:50 +00:00
Matthias Radestock
eacc14dfe2
tidying: remove superfluous var
2014-11-06 22:05:14 +00:00
Matthias Radestock
a16c6acc32
properly detach containers from network on 'weave reset'
...
since otherwise we are leaving veth pairs behind which a) breaks a
subsequent 'weave attach', and b) runs contrary to 'weave reset's
stated purpose of removing all traces of weave.
NB: This does yank the ethwe interface from the containers.
Fixes #164
2014-11-06 22:02:24 +00:00
Matthias Radestock
57c17b6cef
use /dev/urandom instead of /dev/random to avoid blocking
...
...since in some typical deployment scenarios, e.g. small, minimal
VMs, not enough entropy may be available.
Fixes #170 .
2014-11-06 21:46:12 +00:00
David Wragg
0dd9abdd57
Merge pull request #168 from bboreham/167_fix_dns
...
Fix some small issues with weavedns
2014-11-05 18:16:37 +00:00
Bryan Boreham
91b6719924
Fetch docker version, to check things are working
2014-11-05 16:57:59 +00:00
Bryan Boreham
5d8045f5ee
Factor out error check
2014-11-05 16:57:24 +00:00
Bryan Boreham
a0a5921148
Check for error return from AddEventListener
2014-11-05 12:44:39 +00:00
Bryan Boreham
d85071ce4f
Run weavedns with --privilege to work on more locked-down platforms
2014-11-05 12:43:54 +00:00
Bryan Boreham
7b302f5ef0
Add tail -1 to work round Docker logging to wrong place
2014-11-05 12:33:17 +00:00
Bryan Boreham
8229c0617c
Fix small error in curl arguments
2014-11-05 12:33:05 +00:00
Bryan Boreham
d66c8e440c
Change IRC link to botbot.me
2014-11-04 16:45:29 +00:00
Bryan Boreham
4217a112b2
Added IRC link
2014-11-04 12:08:38 +00:00
Bryan Boreham
0d3de8bd38
Emphasise the ways in which IP addresses must not conflict
2014-11-04 12:08:38 +00:00
Michael Bridgen
97c31f0a15
Merge pull request #163 from squaremo/integrate_weavedns
...
Integrate weavedns
2014-11-04 12:00:55 +00:00
Michael Bridgen
01079737fa
Publish the weaveDNS docker image too
2014-11-04 11:54:45 +00:00
Michael Bridgen
b78255f517
Fix typos and grammaros in weavedns README
2014-11-03 19:01:19 +00:00
Michael Bridgen
27beebf5d5
Factor out the wait-for-interface code
2014-11-03 17:47:16 +00:00
Michael Bridgen
8ce6c4aba3
Rewrite weaveDNS README to account for weave integration
2014-11-03 17:34:56 +00:00
Michael Bridgen
55c8b80075
Reform rest_call
...
First, it's not ReST, so rename to http_call; second, separate the
port into its own argument and put the values in variables; third,
replace the container names with the appropriate variables.
2014-10-31 13:29:32 +00:00
Michael Bridgen
67dfc4211c
No need for this Makefile now
2014-10-30 11:38:17 +00:00
Michael Bridgen
08a0cf3442
Merge branch 'master' into integrate_weavedns
...
Conflicts:
weave
2014-10-29 16:28:54 +00:00
Michael Bridgen
7729f6d742
Realign usage message
2014-10-29 15:19:48 +00:00
Michael Bridgen
b47e819485
Don't include routing_prefix in calls from script
...
I took subnets out of the DNS code.
2014-10-29 14:52:03 +00:00
Bryan Boreham
05921833a3
Launch weavedns and update it on run, start, attach and detach
...
Conflicts:
weave
2014-10-29 14:20:24 +00:00
Bryan Boreham
f56700a032
Factor out routine to check if a container is already running
...
Conflicts:
weave
2014-10-29 14:20:24 +00:00
Matthias Radestock