From 4272e0857d125c0f032e67293341aea414ab3dbc Mon Sep 17 00:00:00 2001 From: kev Date: Fri, 12 Jun 2015 18:02:11 +0800 Subject: [PATCH] update --- dnscrypt/proxy/Dockerfile | 16 +++++++++------- dnscrypt/wrapper/Dockerfile | 11 ++++++----- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dnscrypt/proxy/Dockerfile b/dnscrypt/proxy/Dockerfile index 774963b..4291569 100644 --- a/dnscrypt/proxy/Dockerfile +++ b/dnscrypt/proxy/Dockerfile @@ -5,10 +5,17 @@ FROM debian:jessie MAINTAINER kev +ENV LIBSODIUM_VERSION 1.0.3 +ENV DNSCRYPT_VERSION 1.5.0 +ENV LISTEN_ADDR 0.0.0.0:53 +ENV RESOLVER_ADDR 208.67.220.220:443 +ENV PROVIDER_NAME 2.dnscrypt-cert.opendns.com +ENV PROVIDER_KEY B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79 + RUN apt-get update \ && apt-get install -y build-essential curl \ && mkdir libsodium \ - && curl -sSL https://download.libsodium.org/libsodium/releases/libsodium-1.0.3.tar.gz | tar xz --strip 1 -C libsodium \ + && curl -sSL https://download.libsodium.org/libsodium/releases/libsodium-$LIBSODIUM_VERSION.tar.gz | tar xz --strip 1 -C libsodium \ && cd libsodium \ && ./configure --prefix=/usr \ && make install \ @@ -16,7 +23,7 @@ RUN apt-get update \ && cd .. \ && rm -rf libsodium \ && mkdir dnscrypt-proxy \ - && curl -sSL http://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-1.4.3.tar.gz | tar xz --strip 1 -C dnscrypt-proxy \ + && curl -sSL http://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-$DNSCRYPT_VERSION.tar.gz | tar xz --strip 1 -C dnscrypt-proxy \ && cd dnscrypt-proxy \ && ./configure --prefix=/usr \ && make install \ @@ -24,11 +31,6 @@ RUN apt-get update \ && rm -rf dnscrypt-proxy \ && rm -rf /usr/lib/apt/lists/* -ENV LISTEN_ADDR 0.0.0.0:53 -ENV RESOLVER_ADDR 208.67.220.220:443 -ENV PROVIDER_NAME 2.dnscrypt-cert.opendns.com -ENV PROVIDER_KEY B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79 - EXPOSE 53/tcp 53/udp CMD dnscrypt-proxy --local-address=$LISTEN_ADDR \ diff --git a/dnscrypt/wrapper/Dockerfile b/dnscrypt/wrapper/Dockerfile index 8fea68f..0054fae 100644 --- a/dnscrypt/wrapper/Dockerfile +++ b/dnscrypt/wrapper/Dockerfile @@ -5,6 +5,11 @@ FROM debian:jessie MAINTAINER kev +ENV LIBSODIUM_VERSION 1.0.3 +ENV RESOLVER_ADDR 8.8.8.8:53 +ENV LISTEN_ADDR 0.0.0.0:443 +ENV PROVIDER_NAME 2.dnscrypt-cert.datageek.info + RUN apt-get update \ && apt-get install -y autoconf \ automake \ @@ -13,7 +18,7 @@ RUN apt-get update \ git \ libevent-dev \ && mkdir libsodium \ - && curl -sSL https://download.libsodium.org/libsodium/releases/libsodium-1.0.3.tar.gz | tar xz --strip 1 -C libsodium \ + && curl -sSL https://download.libsodium.org/libsodium/releases/libsodium-$LIBSODIUM_VERSION.tar.gz | tar xz --strip 1 -C libsodium \ && cd libsodium \ && ./configure --prefix=/usr \ && make install \ @@ -45,10 +50,6 @@ RUN mkdir -p /var/lib/dnscrypt-wrapper \ --provider-secretkey-file=secret.key \ --gen-cert-file > cert_file.txt -ENV RESOLVER_ADDR 8.8.8.8:53 -ENV LISTEN_ADDR 0.0.0.0:443 -ENV PROVIDER_NAME 2.dnscrypt-cert.datageek.info - WORKDIR /var/lib/dnscrypt-wrapper VOLUME /var/lib/dnscrypt-wrapper