mirror of
https://github.com/vimagick/dockerfiles
synced 2024-06-20 13:58:42 +00:00
update
This commit is contained in:
parent
33f3d795b9
commit
f4f6a1b29e
@ -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
|
||||
|
@ -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
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user