From f59c31059a0e15280ba4bec5ecfd912a71ca8864 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@microsoft.com>
Date: Tue, 2 Jan 2018 13:04:34 -0500
Subject: [PATCH] add coredns

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
---
 coredns/Dockerfile   | 33 +++++++++++++++++++++++++++++++++
 latest-versions.sh   |  1 +
 terraform/Dockerfile |  4 ++--
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 coredns/Dockerfile

diff --git a/coredns/Dockerfile b/coredns/Dockerfile
new file mode 100644
index 0000000..c20be03
--- /dev/null
+++ b/coredns/Dockerfile
@@ -0,0 +1,33 @@
+FROM alpine:latest
+LABEL maintainer "Jessie Frazelle <jess@linux.com>"
+
+ENV PATH /go/bin:/usr/local/go/bin:$PATH
+ENV GOPATH /go
+
+RUN	apk --no-cache add \
+	ca-certificates
+
+ENV COREDNS_VERSION v1.0.2
+
+RUN buildDeps=' \
+		go \
+		git \
+		gcc \
+		g++ \
+		libc-dev \
+		libgcc \
+		make \
+	' \
+	set -x \
+	&& apk --no-cache add $buildDeps \
+	&& git clone --depth 1 --branch ${COREDNS_VERSION} https://github.com/coredns/coredns /go/src/github.com/coredns/coredns \
+	&& cd /go/src/github.com/coredns/coredns \
+	&& make \
+	&& mv coredns /usr/bin/coredns \
+	&& apk del $buildDeps \
+	&& rm -rf /go \
+	&& echo "Build complete."
+
+
+ENTRYPOINT [ "coredns" ]
+CMD [ "--help" ]
diff --git a/latest-versions.sh b/latest-versions.sh
index ee72a8c..81b99b1 100755
--- a/latest-versions.sh
+++ b/latest-versions.sh
@@ -61,6 +61,7 @@ atom/atom
 camlistore/camlistore
 certbot/certbot
 hashicorp/consul
+coredns/coredns
 CouchPotato/CouchPotatoServer
 curl/curl
 google/guetzli
diff --git a/terraform/Dockerfile b/terraform/Dockerfile
index 8381cfe..9852940 100644
--- a/terraform/Dockerfile
+++ b/terraform/Dockerfile
@@ -18,7 +18,6 @@ RUN buildDeps=' \
 		libc-dev \
 		libgcc \
 		make \
-		zip \
 	' \
 	set -x \
 	&& apk --no-cache add --repository https://dl-3.alpinelinux.org/alpine/edge/community $buildDeps \
@@ -26,10 +25,11 @@ RUN buildDeps=' \
 	&& git clone --depth 1 --branch ${TERRAFORM_VERSION} https://github.com/hashicorp/terraform /go/src/github.com/hashicorp/terraform \
 	&& cd /go/src/github.com/hashicorp/terraform \
 	&& XC_ARCH="amd64" XC_OS="linux" make bin \
-	&& mv pkg/linux_amd64/terraform /usr/bin/ \
+	&& mv bin/terraform /usr/bin/terraform \
 	&& apk del $buildDeps \
 	&& rm -rf /go \
 	&& echo "Build complete."
 
 
 ENTRYPOINT [ "terraform" ]
+CMD [ "--help" ]