From f4f6a1b29ebbbaaf35de9a7773105f667f948c69 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Sat, 23 May 2015 12:48:11 +0800
Subject: [PATCH] update

---
 chinadns/Dockerfile    | 48 ++++++++++++++++++++++++------------------
 chinadns/dnsmasq.conf  |  7 ------
 chinadns/services.conf |  6 +++++-
 3 files changed, 33 insertions(+), 28 deletions(-)
 delete mode 100644 chinadns/dnsmasq.conf

diff --git a/chinadns/Dockerfile b/chinadns/Dockerfile
index 5c1fd48..58bb27b 100644
--- a/chinadns/Dockerfile
+++ b/chinadns/Dockerfile
@@ -5,28 +5,36 @@
 FROM ubuntu:14.04
 MAINTAINER kev <noreply@datageek.info>
 
-RUN apt-get update
-RUN apt-get install -y build-essential supervisor dnsmasq
-RUN apt-get clean
+ENV DNS_VER 1.3.1
+ENV DNS_URL https://github.com/clowwindy/ChinaDNS/releases/download/${DNS_VER}/chinadns-${DNS_VER}.tar.gz
+ENV DNS_DIR /tmp/chinadns
+ENV DNS_FILE chinadns.tar.gz
+ENV DNS_MD5 9e2aca1a265aec7ca87f4d0377d9fa74
+
+RUN apt-get update \
+    && apt-get install -y build-essential curl dnsmasq supervisor \
+    && mkdir -p ${DNS_DIR} \
+    && cd ${DNS_DIR} \
+    && curl -sSL ${DNS_URL} -o ${DNS_FILE} \
+    && echo "${DNS_MD5} ${DNS_FILE}" | md5sum -c \
+    && tar xzf ${DNS_FILE} --strip 1 \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -rf ${DNS_DIR}
+    && apt-get remove -y build-essential \
+    && apt-get autoremove \
+    && apt-get clean -y \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl http://ftp.apnic.net/apnic/stats/apnic/delegated-apnic-latest \
+        | grep ipv4 \
+            | grep CN \
+                | awk -F\| '{printf("%s/%d\n", $4, 32-log($5)/log(2))}' > /etc/chnroute.txt
 
 ADD ./services.conf /etc/supervisor/conf.d/
-ADD ./dnsmasq.conf /etc/
-ADD https://github.com/clowwindy/ChinaDNS/releases/download/1.3.0/chinadns-1.3.0.tar.gz /tmp/pkgs/
-ADD http://ftp.apnic.net/apnic/stats/apnic/delegated-apnic-latest /tmp/pkgs/
 
-WORKDIR /tmp/pkgs/
-
-RUN tar xzf chinadns-1.3.0.tar.gz && \
-    cd chinadns-1.3.0 && \
-    ./configure && \
-    make && \
-    make install
-
-RUN cat delegated-apnic-latest | grep ipv4 | grep CN | \
-    awk -F\| '{ printf("%s/%d\n", $4, 32-log($5)/log(2)) }' > /etc/chnroute.txt
-
-WORKDIR /
-RUN rm -r /tmp/pkgs/
-EXPOSE 53 53/udp
+EXPOSE 53/tcp 53/udp
 
 CMD supervisord -n -c /etc/supervisor/supervisord.conf
diff --git a/chinadns/dnsmasq.conf b/chinadns/dnsmasq.conf
deleted file mode 100644
index b334acd..0000000
--- a/chinadns/dnsmasq.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-bind-interfaces
-listen-address=0.0.0.0
-port=53
-user=root
-no-resolv
-strict-order
-server=127.0.0.1#2053
diff --git a/chinadns/services.conf b/chinadns/services.conf
index fb5aa19..7fcbae6 100644
--- a/chinadns/services.conf
+++ b/chinadns/services.conf
@@ -4,4 +4,8 @@ command = chinadns -m -c /etc/chnroute.txt -p 2053
 
 [program:dnsmasq]
 priority = 200
-command = dnsmasq -d -C /etc/dnsmasq.conf
+command = dnsmasq --keep-in-foreground \
+                  --conf-file=/dev/null \
+                  --cache-size=25000 \
+                  --no-resolv \
+                  --server=127.0.0.1#2053