From 71bf7aae3f55b168eccbd8d1c76a6a63fb5cb441 Mon Sep 17 00:00:00 2001 From: Asynchronous Interruption #0 Date: Thu, 21 Jul 2016 09:24:04 +0800 Subject: [PATCH] Update dependencies in Dockerfile (#732) --- docker/alpine/Dockerfile | 11 ++++++----- docker/ubuntu/Dockerfile | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 7ae64243..e5347ce1 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -5,14 +5,13 @@ FROM alpine MAINTAINER kev -ENV SS_VER 2.4.6 -ENV SS_URL https://github.com/shadowsocks/shadowsocks-libev/archive/v$SS_VER.tar.gz -ENV SS_DIR shadowsocks-libev-$SS_VER -ENV SS_DEP autoconf build-base curl libtool linux-headers openssl-dev +ENV SS_URL https://github.com/shadowsocks/shadowsocks-libev.git +ENV SS_DIR shadowsocks-libev +ENV SS_DEP git autoconf build-base curl libtool linux-headers openssl-dev asciidoc xmlto RUN set -ex \ && apk add --update $SS_DEP \ - && curl -sSL $SS_URL | tar xz \ + && git clone $SS_URL \ && cd $SS_DIR \ && ./configure \ && make install \ @@ -27,6 +26,7 @@ ENV PASSWORD= ENV METHOD aes-256-cfb ENV TIMEOUT 300 ENV DNS_ADDR 8.8.8.8 +ENV DNS_ADDR_2 8.8.4.4 EXPOSE $SERVER_PORT EXPOSE $SERVER_PORT/udp @@ -38,4 +38,5 @@ CMD ss-server -s $SERVER_ADDR \ -t $TIMEOUT \ --fast-open \ -d $DNS_ADDR \ + -d $DNS_ADDR_2 \ -u diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 2391cddd..12aa2840 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:latest MAINTAINER Sah Lee -ENV DEPENDENCIES git-core build-essential autoconf libtool libssl-dev +ENV DEPENDENCIES git-core build-essential autoconf libtool libssl-dev asciidoc xmlto ENV BASEDIR /tmp/shadowsocks-libev ENV SERVER_PORT 8338