Added BasicAuth to tinyproxy, updated docs and dockerfiles

This commit is contained in:
Patrick Kishino
2020-05-29 15:03:10 +09:00
parent 86951a97e5
commit 8fc5503879
9 changed files with 36 additions and 10 deletions

View File

@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:19.10
VOLUME /data
VOLUME /config
@@ -12,12 +12,12 @@ ENV DEBIAN_FRONTEND=noninteractive
# Update, upgrade and install core software
RUN apt update \
&& apt -y upgrade \
&& apt -y install software-properties-common wget git curl jq \
&& apt -y install apt-utils software-properties-common wget git curl jq \
&& add-apt-repository ppa:transmissionbt/ppa \
&& apt update \
&& apt install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip ufw iputils-ping openvpn bc tzdata \
&& apt install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip ufw iputils-ping openvpn bc tzdata bash \
python2.7 python2.7-pysqlite2 && ln -sf /usr/bin/python2.7 /usr/bin/python2 \
&& apt -y upgrade \
&& wget https://github.com/Secretmapper/combustion/archive/release.zip \
&& unzip release.zip -d /opt/transmission-ui/ \
&& rm release.zip \
@@ -28,7 +28,7 @@ RUN apt update \
&& ln -s /usr/share/transmission/web/javascript /opt/transmission-ui/transmission-web-control \
&& ln -s /usr/share/transmission/web/index.html /opt/transmission-ui/transmission-web-control/index.original.html \
&& git clone git://github.com/endor/kettu.git /opt/transmission-ui/kettu \
&& apt install -y tinyproxy telnet \
&& apt install -y tinyproxy telnet vim \
&& wget https://github.com/Yelp/dumb-init/releases/download/v${DUMBINIT_VERSION}/dumb-init_${DUMBINIT_VERSION}_amd64.deb \
&& dpkg -i dumb-init_${DUMBINIT_VERSION}_amd64.deb \
&& rm -rf dumb-init_${DUMBINIT_VERSION}_amd64.deb \
@@ -133,6 +133,8 @@ ENV OPENVPN_USERNAME=**None** \
DROP_DEFAULT_ROUTE= \
WEBPROXY_ENABLED=false \
WEBPROXY_PORT=8888 \
WEBPROXY_USERNAME= \
WEBPROXY_PASSWORD= \
HEALTH_CHECK_HOST=google.com \
DOCKER_LOG=false