Fix openvpn problems, remove tinyproxy, move dockerfile to ubuntu 18.04 as alpine crashes

This commit is contained in:
Eldwan Brianne
2021-02-15 18:44:10 +01:00
parent 88d05f44e0
commit b71fa6764c
10 changed files with 85 additions and 125 deletions

View File

@@ -1,14 +1,24 @@
FROM alpine:edge
FROM ubuntu:18.04
RUN echo "@edgecommunity http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
&& echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& apk update \
&& apk add --upgrade apk-tools \
&& apk add bash dumb-init openvpn shadow curl jq tzdata openrc tinyproxy tinyproxy-openrc openssh unrar deluge@testing ufw@edgecommunity \
&& rm -rf /tmp/* /var/tmp/* \
&& groupadd -g 911 abc \
&& useradd -u 911 -g 911 -s /bin/false -m abc \
&& usermod -G users abc
ARG DEBIAN_FRONTEND="noninteractive"
RUN set -ex; \
apt-get update && \
apt-get -y install gnupg apt-utils && \
apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C5E6A5ED249AD24C && \
echo "deb http://ppa.launchpad.net/deluge-team/stable/ubuntu bionic main" >> \
/etc/apt/sources.list.d/deluge.list && \
echo "deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu bionic main" >> \
/etc/apt/sources.list.d/deluge.list && \
echo "**** install packages ****" && \
apt-get update && \
apt-get -y install dumb-init iputils-ping dnsutils bash jq net-tools openvpn curl ufw deluged deluge-console deluge-web python3-future python3-requests p7zip-full unrar unzip && \
echo "Cleanup"; \
rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/* && \
echo "Adding user"; \
groupadd -g 911 abc && \
useradd -u 911 -g 911 -s /bin/false -m abc && \
usermod -G users abc
# Add configuration and scripts
COPY root/ /
@@ -23,10 +33,6 @@ ENV OPENVPN_USERNAME=**None** \
PUID= \
PGID= \
DROP_DEFAULT_ROUTE= \
WEBPROXY_ENABLED=false \
WEBPROXY_PORT=8888 \
WEBPROXY_USERNAME= \
WEBPROXY_PASSWORD= \
HEALTH_CHECK_HOST=google.com \
LANG='en_US.UTF-8' \
LANGUAGE='en_US.UTF-8' \
@@ -35,20 +41,9 @@ ENV OPENVPN_USERNAME=**None** \
HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh
# Compatability with https://hub.docker.com/r/willfarrell/autoheal/
LABEL autoheal=true
VOLUME /downloads
VOLUME /config
# Expose web ui port
EXPOSE 8112
# expose port for deluge daemon
EXPOSE 58846
# expose port for incoming torrent data (tcp and udp)
EXPOSE 58946
EXPOSE 58946/udp
EXPOSE 8112 58846 58946 58946/udp
CMD ["dumb-init", "/etc/openvpn/start.sh"]