Merge remote-tracking branch 'upstream/master'

Conflicts:
	dns/Dockerfile

dns/Dockerfile

@@ -1,6 +0,0 @@
-FROM ubuntu
-MAINTAINER Zettio weave@zett.io
-WORKDIR /home/weave
-ADD ./dns /home/weave/
-EXPOSE 53/udp
-CMD ["/home/weave/dns"]

docker/Dockerfile

@@ -0,0 +1,5 @@
+FROM scratch
+# EXPOSE 53/udp
+WORKDIR /home/weave
+ADD ./weavedns /home/weave/
+ENTRYPOINT ["/home/weave/weavedns"]

docker/Makefile

@@ -0,0 +1,21 @@
+IMAGE:=/tmp/weavedns.tar
+MAIN:=../
+
+.DEFAULT: docker-image
+
+all: docker-image
+
+weavedns: ../server/*.go ../main.go
+	go get $(MAIN) && GOARCH=amd64 GOOS=linux go build -o $@ -v $(MAIN)
+
+.PHONY: docker-image
+
+docker-image: $(IMAGE)
+
+$(IMAGE): Dockerfile weavedns
+	sudo -E docker build -t zettio/weavedns .
+	sudo -E docker save zettio/weavedns > $(IMAGE)
+
+clean:
+	-sudo docker rmi zettio/weavedns
+	rm -f weavedns $(IMAGE)

main.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/miekg/dns"
-	"github.com/zettio/weavedns"
+	"github.com/zettio/weavedns/server"
 	"log"
 	"net"
 	"time"