update dnscrypt

dnscrypt/proxy/Dockerfile

@@ -2,44 +2,24 @@
 # Dockerfile for dnscrypt-proxy
 #
 
-FROM debian:jessie
-MAINTAINER kev <noreply@easypi.pro>
+FROM alpine:3
+MAINTAINER EasyPi Software Foundation
 
-ENV LIBSODIUM_VERSION 1.0.15
-ENV DNSCRYPT_VERSION 1.9.5
-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
+ARG DNSCRYPT_PROXY_VERSION=2.1.1
+ARG DNSCRYPT_PROXY_FILE=dnscrypt-proxy-linux_x86_64-${DNSCRYPT_PROXY_VERSION}.tar.gz
+ARG DNSCRYPT_PROXY_URL=https://github.com/DNSCrypt/dnscrypt-proxy/releases/download/${DNSCRYPT_PROXY_VERSION}/${DNSCRYPT_PROXY_FILE}
+
+WORKDIR /etc/dnscrypt-proxy
 
 RUN set -xe \
-    && apt-get update \
-    && apt-get install -y ca-certificates \
-                          build-essential \
-                          curl \
-    && mkdir libsodium \
-        && cd libsodium \
-        && curl -sSL https://download.libsodium.org/libsodium/releases/libsodium-$LIBSODIUM_VERSION.tar.gz | tar xz --strip 1 \
-        && ./configure --prefix=/usr --enable-minimal \
-        && make install \
-        && ldconfig \
-        && cd .. \
-        && rm -rf libsodium \
-    && mkdir dnscrypt-proxy \
-        && cd dnscrypt-proxy \
-        && curl -sSL https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-$DNSCRYPT_VERSION.tar.gz | tar xz --strip 1 \
-        && ./configure --prefix=/usr --with-plugins \
-        && make install \
-        && cd .. \
-        && rm -rf dnscrypt-proxy \
-    && apt-get purge --auto-remove -y ca-certificates \
-                                      build-essential \
-                                      curl \
-    && rm -rf /usr/lib/apt/lists/*
+ && apk add --no-cache curl tar \
+ && curl -sSL ${DNSCRYPT_PROXY_URL} | tar xz --strip 1 \
+ && mv dnscrypt-proxy /usr/local/bin/ \
+ && sed '/^listen_addresses/s/127.0.0.1:53/0.0.0.0:53/' example-dnscrypt-proxy.toml > dnscrypt-proxy.toml
+
+VOLUME /etc/dnscrypt-proxy
 
 EXPOSE 53/tcp 53/udp
 
-CMD dnscrypt-proxy --local-address=$LISTEN_ADDR \
-                   --provider-name=$PROVIDER_NAME \
-                   --provider-key=$PROVIDER_KEY \
-                   --resolver-address=$RESOLVER_ADDR
+ENTRYPOINT ["dnscrypt-proxy"]
+CMD ["-config", "dnscrypt-proxy.toml"]