diff --git a/Dockerfile b/Dockerfile index 0c5087c..a1ad38f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,18 @@ FROM alpine -MAINTAINER David Personette +#MAINTAINER Ramil Minkhanov # Install tor and privoxy -RUN apk --no-cache --no-progress upgrade && \ - apk --no-cache --no-progress add bash curl privoxy shadow tini tor tzdata&&\ +RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories && \ + echo 'http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && \ + apk --no-cache --no-progress upgrade && \ + apk --no-cache --no-progress add bash curl privoxy shadow tini tor tzdata lyrebird &&\ + cp /etc/privoxy/config.new /etc/privoxy/config &&\ + cp /etc/privoxy/default.filter.new /etc/privoxy/default.filter &&\ + cp /etc/privoxy/user.filter.new /etc/privoxy/user.filter &&\ + cp /etc/privoxy/match-all.action.new /etc/privoxy/match-all.action &&\ + cp /etc/privoxy/default.action.new /etc/privoxy/default.action &&\ + cp /etc/privoxy/user.action.new /etc/privoxy/user.action &&\ + chmod -R 777 /etc/privoxy/ &&\ file='/etc/privoxy/config' && \ sed -i 's|^\(accept-intercepted-requests\) .*|\1 1|' $file && \ sed -i '/^listen/s|127\.0\.0\.1||' $file && \ @@ -48,8 +57,13 @@ RUN apk --no-cache --no-progress upgrade && \ echo 'TransPort 0.0.0.0:9040' >>/etc/tor/torrc && \ echo 'User tor' >>/etc/tor/torrc && \ echo 'VirtualAddrNetworkIPv4 10.192.0.0/10' >>/etc/tor/torrc && \ + echo 'UseBridges 1' >> /etc/tor/torrc && \ + echo 'ClientTransportPlugin obfs4 exec /usr/bin/lyrebird managed' >> /etc/tor/torrc && \ + # You can change bridge + echo 'Bridge obfs4 82.64.115.17:990 B08238781C2CD80DBD95AEABEB6F6C75F2E2CEB6 cert=1udeMlFNs3sJ20zwpPE6nShZqqwDb3F1ET4KzfSfD+fktkue9zNx9H3t+yLCPAsg+6UTUA iat-mode=1' >> /etc/tor/torrc && \ + echo 'Bridge obfs4 103.17.154.137:443 7CA829973901F71B93BBF2014C0EBEA366C21A2B cert=xcxDL1FZTXJHhFdDIHZWf1yqheNdB52l1ztDMliS3myvoeS6aNV0bg8/K8pkrWh7LM9dWg iat-mode=0' >> /etc/tor/torrc && \ mkdir -p /etc/tor/run && \ - chown -Rh tor. /var/lib/tor /etc/tor/run && \ + chown -Rh tor /var/lib/tor /etc/tor/run && \ chmod 0750 /etc/tor/run && \ rm -rf /tmp/* diff --git a/torproxy.sh b/torproxy.sh index d7f6ccd..e91691b 100755 --- a/torproxy.sh +++ b/torproxy.sh @@ -140,7 +140,7 @@ for env in $(printenv | grep '^TOR_'); do fi done -chown -Rh tor. /etc/tor /var/lib/tor /var/log/tor 2>&1 | +chown -Rh tor /etc/tor /var/lib/tor /var/log/tor 2>&1 | grep -iv 'Read-only' || : if [[ $# -ge 1 && -x $(which $1 2>&-) ]]; then