aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--docker/Dockerfile16
-rwxr-xr-xdocker/hooks/build3
-rw-r--r--hooks/pre_build7
4 files changed, 8 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index f4bfd2686..8f141ba4e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ all: coredns
# TODO: Add .go file dependencies.
.PHONY: coredns
coredns: check godeps
- go build $(BUILD_VERBOSE) -ldflags="-s -w"
+ CGO_ENABLED=0 go build $(BUILD_VERBOSE) -ldflags="-s -w"
.PHONY: deps
deps: core/zmiddleware.go core/dnsserver/zdirectives.go godeps
diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index a889c1a3e..000000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM alpine:latest
-MAINTAINER Miek Gieben <miek@coredns.io> @miekg
-
-# only need ca-certificates & openssl if want to use https_google
-RUN apk --update add bind-tools ca-certificates openssl && update-ca-certificates && rm -rf /var/cache/apk/*
-
-ARG COREDNS_VERSION=latest
-
-RUN echo build coredns v$COREDNS_VERSION
-
-ADD https://github.com/coredns/coredns/releases/download/v${COREDNS_VERSION}/coredns_${COREDNS_VERSION}_linux_x86_64.tgz /
-
-RUN tar -xzf coredns_${COREDNS_VERSION}_linux_x86_64.tgz && rm coredns_${COREDNS_VERSION}_linux_x86_64.tgz
-
-EXPOSE 53 53/udp
-ENTRYPOINT ["/coredns"]
diff --git a/docker/hooks/build b/docker/hooks/build
deleted file mode 100755
index 369555ec5..000000000
--- a/docker/hooks/build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -x
-docker build --build-arg COREDNS_VERSION=$SOURCE_BRANCH -t $IMAGE_NAME .
diff --git a/hooks/pre_build b/hooks/pre_build
new file mode 100644
index 000000000..476077e7f
--- /dev/null
+++ b/hooks/pre_build
@@ -0,0 +1,7 @@
+#!/bin/sh
+echo "=> Building the CoreDNS binary"
+docker run \
+ -v $(pwd):/go/src/github.com/coredns/coredns \
+ -w /go/src/github.com/coredns/coredns \
+ golang:1.8.0 \
+ make