From 59b1db76c8bf8124f3cf92c92f5ef2140c6220c0 Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Fri, 3 Oct 2014 20:08:32 +0100 Subject: [PATCH] Added Makefile and updated Dockerfile The Dockerfile is now more like the weave one, with a scratch layer underneath. Makefile taken more or less from weave, too; except, it uses environment variables to cross-compile the binary (which should probably be done for weave as well) --- dns/Dockerfile | 8 +++++--- dns/Makefile | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 dns/Makefile diff --git a/dns/Dockerfile b/dns/Dockerfile index b4feddc1..181bcbbc 100644 --- a/dns/Dockerfile +++ b/dns/Dockerfile @@ -1,3 +1,5 @@ -FROM ubuntu -EXPOSE 53/udp -ADD ./dns /home/dns +FROM scratch +# EXPOSE 53/udp +WORKDIR /home/weave +ADD ./dns /home/weave/weavedns +ENTRYPOINT ["/home/weave/weavedns"] diff --git a/dns/Makefile b/dns/Makefile new file mode 100644 index 00000000..63939da5 --- /dev/null +++ b/dns/Makefile @@ -0,0 +1,20 @@ +IMAGE:=/tmp/weavedns.tar + +.DEFAULT: docker-image + +all: docker-image + +dns: ../*.go main.go + go get && GOARCH=amd64 GOOS=linux go build -v + +.PHONY: docker-image + +docker-image: $(IMAGE) + +$(IMAGE): Dockerfile dns + sudo -E docker build --rm -t zettio/weavedns . + sudo -E docker save zettio/weavedns > $(IMAGE) + +clean: + -sudo docker rmi zettio/weavedns + rm -f dns $(IMAGE)