Commit Graph
6 Commits
Author SHA1 Message Date
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
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 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
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