Commit Graph
43 Commits
Author SHA1 Message Date
Michael Bridgen 08eb90c938 No longer is local_ip welcome in weaveDNS
(and point at weaveDNS's readme rather than the blog post, which is
out of date)
2015-01-26 11:49:02 +00:00
Michael Bridgen 14f7d83e3e Merge branch '321_cope_with_weavetools_delays' of git://github.com/rade/weave into pr334 2015-01-09 17:40:42 +00:00
Matthias Radestock f7ad2cd5af wait longer for ethwe interface to come up
in case we are running on a really, really slow machine/VM
2015-01-08 22:22:40 +00:00
Bryan Boreham bd2844d186 Split http-startup code from server-startup 2015-01-08 18:38:38 +00:00
Matthias Radestock 844fd54e18 less willing 2015-01-07 12:20:44 +00:00
Matthias Radestock 4ecd4e727f rewording of must of the weaveDNS intro 2015-01-07 12:16:16 +00:00
Matthias Radestock 0777a1e3b0 cosmetic: remove trailing whitespace 2015-01-07 11:43:12 +00:00
Bryan Boreham 27f9a380e8 Explain weaveDNS configuration better 2015-01-07 11:34:16 +00:00
Bryan Boreham 82b54aabcd Move logging, updating and testing utils into common directory 2015-01-02 14:49:49 +00:00
Michael Bridgen 0a14eb58b2 Don't hardwire executable names; use logical names instead
We could use `os.Args[0]` instead of hardwired names, but that ends up
being e.g. `/home/weave/weaver`. So, use logical names instead.
2014-12-24 11:52:50 +00:00
Michael Bridgen b014d98c78 Put versions in the script and weavedns too, and report them
sudo weave version
2014-12-24 11:04:52 +00:00
Liang-Chi Hsieh f5afe3b203 Merge remote-tracking branch 'upstream/master' into if_param
Conflicts:
	weave
	weaver/Dockerfile
2014-12-22 20:58:20 +08:00
Matthias Radestock 7ccb9e36d9 update Dockerfile MAINTAINER
and also use what appears to be (based on some sampling of the docker
registry) the correct convention for specifying the email address.

Also ditch superfluous CMD instruction in weaver.
2014-12-22 11:11:00 +00:00
Liang-Chi Hsieh 1dc28e9025 Assign iface parameter from defined variable. 2014-12-22 15:59:29 +08:00
Matthias Radestock dc1942395d use the same /24 IP for DNS server everywhere 2014-12-12 23:24:37 +00:00
Matthias Radestock 27b12990a9 correct instructions for DNS sub-net 2014-12-12 23:23:59 +00:00
Matthias Radestock 215149a096 ungarble 2014-12-12 23:20:27 +00:00
Bryan Boreham 4297f68860 Explain multiple containers with same name
Two further scenarios described
2014-12-09 12:07:29 +00:00
Matthias Radestock b409519a1b fix typo 2014-12-01 19:27:10 +00:00
Michael Bridgen 56056c06b1 Merge remote-tracking branch 'rade/186_stop_dns' 2014-11-28 12:55:43 +00:00
Matthias Radestock f8ec75d6fb document how to configure search across sub-domains 2014-11-28 10:35:28 +00:00
Matthias Radestock c070f0b08c add weave stop-dns
and in the process disentangle stopping dns from `weave stop`
2014-11-28 10:13:48 +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
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
Bryan Boreham 42f0cb883a Add --with-dns option to weave run 2014-11-24 20:14:01 +00:00
Bryan Boreham 21b190ed41 Revert "Use Docker bridge IP for DNS" 2014-11-24 18:02:11 +00:00
Michael Bridgen 2a8ef7803b Catch the README up with the change in IP used 2014-11-21 16:23:56 +00:00
Matthias Radestock 12d1af3a1c tidying around --dns-search 2014-11-18 15:50:17 +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
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
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 67dfc4211c No need for this Makefile now 2014-10-30 11:38:17 +00:00
Michael Bridgen 44cac7fb40 Build weavedns bin and container in the Makefile 2014-10-29 14:20:24 +00:00
Michael Bridgen a384e0bc16 Move more weavedns things out of the way 2014-10-29 12:23:18 +00:00
Michael Bridgen 822ec90606 Rename weavedns package to nameserver, and fix up 2014-10-29 11:41:58 +00:00
Michael Bridgen 8469fea215 Move files around in preparation for melding into weave code
* library code will go in weave/nameserver/
 * main.go for the server goes in weavedns/ with the containerising
2014-10-29 11:34:56 +00:00