From b0268f3833204898b89e8b8abce7f2f14477dc9d Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Tue, 23 Dec 2014 14:34:59 -0800
Subject: [PATCH] Use a kubernetes-hosted minimal container for skydns

---
 contrib/dns/skydns-rc.yaml.in |  4 ++--
 contrib/dns/skydns/Dockerfile |  4 ++++
 contrib/dns/skydns/Makefile   | 13 +++++++++++++
 contrib/dns/skydns/README.md  |  5 +++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 contrib/dns/skydns/Dockerfile
 create mode 100644 contrib/dns/skydns/Makefile
 create mode 100644 contrib/dns/skydns/README.md

diff --git a/contrib/dns/skydns-rc.yaml.in b/contrib/dns/skydns-rc.yaml.in
index b280e6765c8..1043de7d997 100644
--- a/contrib/dns/skydns-rc.yaml.in
+++ b/contrib/dns/skydns-rc.yaml.in
@@ -25,13 +25,13 @@ desiredState:
                     "-peer-bind-addr=127.0.0.1",
             ]
           - name: kube2sky
-            image: kubernetes/kube2sky:latest
+            image: kubernetes/kube2sky:1.0
             command: [
                     # entrypoint = "/kube2sky",
                     "-domain={DNS_DOMAIN}",
             ]
           - name: skydns
-            image: skynetservices/skydns:latest
+            image: kubernetes/skydns:2014-12-23-001
             command: [
                     # entrypoint = "/skydns",
                     "-machines=http://localhost:4001",
diff --git a/contrib/dns/skydns/Dockerfile b/contrib/dns/skydns/Dockerfile
new file mode 100644
index 00000000000..7e0c5b92bc3
--- /dev/null
+++ b/contrib/dns/skydns/Dockerfile
@@ -0,0 +1,4 @@
+FROM busybox
+MAINTAINER Tim Hockin <thockin@google.com>
+ADD skydns skydns
+ENTRYPOINT ["/skydns"]
diff --git a/contrib/dns/skydns/Makefile b/contrib/dns/skydns/Makefile
new file mode 100644
index 00000000000..d29c3c37108
--- /dev/null
+++ b/contrib/dns/skydns/Makefile
@@ -0,0 +1,13 @@
+all: skydns
+
+skydns:
+	CGO_ENABLED=0 go build -a --ldflags '-w' github.com/skynetservices/skydns
+
+container: skydns
+	sudo docker build -t kubernetes/skydns .
+
+push:
+	sudo docker push kubernetes/skydns
+
+clean:
+	rm -f skydns
diff --git a/contrib/dns/skydns/README.md b/contrib/dns/skydns/README.md
new file mode 100644
index 00000000000..02a44bc5aa1
--- /dev/null
+++ b/contrib/dns/skydns/README.md
@@ -0,0 +1,5 @@
+# skydns for kubernetes
+=======================
+
+This container only exists until skydns itself is reduced in some way.  At the
+time of this writing, it is over 600 MB large.