diff --git a/docker/shadowsocks-libev/Dockerfile b/docker/shadowsocks-libev/Dockerfile index 4b0b0a9..159dd31 100644 --- a/docker/shadowsocks-libev/Dockerfile +++ b/docker/shadowsocks-libev/Dockerfile @@ -7,10 +7,10 @@ FROM debian:stretch LABEL maintainer="Teddysun " RUN set -ex \ - && printf "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list \ - && apt-get update \ - && apt-get -t stretch-backports install -y --no-install-recommends shadowsocks-libev simple-obfs \ - && rm -rf /var/lib/apt/lists/* + && printf "deb http://deb.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/stretch-backports.list \ + && apt-get update \ + && apt-get -t stretch-backports install -y --no-install-recommends shadowsocks-libev simple-obfs \ + && rm -rf /var/lib/apt/lists/* COPY ./config_sample.json /etc/shadowsocks-libev/config.json VOLUME /etc/shadowsocks-libev diff --git a/docker/shadowsocks-libev/alpine/Dockerfile b/docker/shadowsocks-libev/alpine/Dockerfile index b5b01ac..8e630c7 100644 --- a/docker/shadowsocks-libev/alpine/Dockerfile +++ b/docker/shadowsocks-libev/alpine/Dockerfile @@ -10,46 +10,44 @@ ENV LIBEV_VER 3.2.0 ENV LIBEV_NAME shadowsocks-libev-${LIBEV_VER} ENV LIBEV_RELEASE https://github.com/shadowsocks/shadowsocks-libev/releases/download/v${LIBEV_VER}/${LIBEV_NAME}.tar.gz -RUN set -ex \ - && runDeps=' \ - tar \ - git \ - wget \ - build-base \ - c-ares-dev \ - autoconf \ - automake \ - libev-dev \ - libtool \ - libsodium-dev \ - linux-headers \ - mbedtls-dev \ - pcre-dev \ - ' \ - && apk add --no-cache --virtual .build-deps \ - ${runDeps} \ - && mkdir -p /tmp/libev \ - && cd /tmp/libev \ - && git clone --depth=1 https://github.com/shadowsocks/simple-obfs.git . \ - && git submodule update --init --recursive \ - && ./autogen.sh \ - && ./configure --prefix=/usr --disable-documentation \ - && make install \ - && rm -rf * \ - && wget -qO ${LIBEV_NAME}.tar.gz ${LIBEV_RELEASE} \ - && tar zxf ${LIBEV_NAME}.tar.gz \ - && cd ${LIBEV_NAME} \ - && ./configure --prefix=/usr --disable-documentation \ - && make install \ - && apk add --no-cache \ - rng-tools \ - $(scanelf --needed --nobanner /usr/bin/ss-* \ - | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ - | xargs -r apk info --installed \ - | sort -u) \ - && apk del .build-deps \ - && cd /tmp \ - && rm -rf /tmp/libev \ +RUN runDeps="\ + tar \ + git \ + wget \ + build-base \ + c-ares-dev \ + autoconf \ + automake \ + libev-dev \ + libtool \ + libsodium-dev \ + linux-headers \ + mbedtls-dev \ + pcre-dev \ + "; \ + set -ex \ + && apk add --no-cache --virtual .build-deps ${runDeps} \ + && mkdir -p /tmp/libev \ + && cd /tmp/libev \ + && git clone --depth=1 https://github.com/shadowsocks/simple-obfs.git . \ + && git submodule update --init --recursive \ + && ./autogen.sh \ + && ./configure --prefix=/usr --disable-documentation \ + && make install \ + && rm -rf * \ + && wget -qO ${LIBEV_NAME}.tar.gz ${LIBEV_RELEASE} \ + && tar zxf ${LIBEV_NAME}.tar.gz \ + && cd ${LIBEV_NAME} \ + && ./configure --prefix=/usr --disable-documentation \ + && make install \ + && apk add --no-cache rng-tools \ + $(scanelf --needed --nobanner /usr/bin/ss-* \ + | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \ + | xargs -r apk info --installed \ + | sort -u) \ + && apk del .build-deps \ + && cd /tmp \ + && rm -rf /tmp/libev COPY ./config_sample.json /etc/shadowsocks-libev/config.json VOLUME /etc/shadowsocks-libev diff --git a/docker/shadowsocks-r/Dockerfile b/docker/shadowsocks-r/Dockerfile index 912b78d..81c9eba 100644 --- a/docker/shadowsocks-r/Dockerfile +++ b/docker/shadowsocks-r/Dockerfile @@ -7,14 +7,14 @@ FROM debian:stretch LABEL maintainer="Teddysun " RUN set -ex \ - && apt-get update \ - && apt-get install -y wget python libsodium-dev openssl \ - && rm -rf /var/lib/apt/lists/* \ - && wget -O /tmp/shadowsocksr-3.2.2.tar.gz https://github.com/shadowsocksrr/shadowsocksr/archive/3.2.2.tar.gz \ - && tar zxf /tmp/shadowsocksr-3.2.2.tar.gz -C /tmp \ - && mv /tmp/shadowsocksr-3.2.2/shadowsocks /usr/local/ \ - && rm -fr /tmp/shadowsocksr-3.2.2 \ - && rm -f /tmp/shadowsocksr-3.2.2.tar.gz + && apt-get update \ + && apt-get install -y wget python libsodium-dev openssl \ + && rm -rf /var/lib/apt/lists/* \ + && wget -O /tmp/shadowsocksr-3.2.2.tar.gz https://github.com/shadowsocksrr/shadowsocksr/archive/3.2.2.tar.gz \ + && tar zxf /tmp/shadowsocksr-3.2.2.tar.gz -C /tmp \ + && mv /tmp/shadowsocksr-3.2.2/shadowsocks /usr/local/ \ + && rm -fr /tmp/shadowsocksr-3.2.2 \ + && rm -f /tmp/shadowsocksr-3.2.2.tar.gz COPY ./config_sample.json /etc/shadowsocks-r/config.json VOLUME /etc/shadowsocks-r