diff --git a/Dockerfile b/Dockerfile index 524f61a..9878ee5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN apt update \ /tmp/* \ /var/tmp/* -# Compile libtorrent +# Compile and install libtorrent-rasterbar RUN apt update \ && apt upgrade -y \ && apt install -y --no-install-recommends \ @@ -94,7 +94,7 @@ RUN apt update \ /tmp/* \ /var/tmp/* -# Compile qBittorrent +# Compile and install qBittorrent RUN apt update \ && apt upgrade -y \ && apt install -y --no-install-recommends \ @@ -102,6 +102,7 @@ RUN apt update \ ca-certificates \ curl \ git \ + jq \ libboost-system-dev \ libssl-dev \ pkg-config \ @@ -123,6 +124,7 @@ RUN apt update \ ca-certificates \ curl \ git \ + jq \ libboost-system-dev \ libssl-dev \ pkg-config \ @@ -136,6 +138,7 @@ RUN apt update \ /tmp/* \ /var/tmp/* +# Install WireGuard and some other dependencies some of the scripts in the container rely on. RUN echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.list.d/unstable-wireguard.list \ && printf 'Package: *\nPin: release a=unstable\nPin-Priority: 150\n' > /etc/apt/preferences.d/limit-unstable \ && apt update \ @@ -163,6 +166,7 @@ RUN echo "deb http://deb.debian.org/debian/ unstable main" > /etc/apt/sources.li /tmp/* \ /var/tmp/* +# Install (un)compressing tools like unrar, 7z, unzip and zip RUN echo "deb http://deb.debian.org/debian/ buster non-free" > /etc/apt/sources.list.d/non-free-unrar.list \ && printf 'Package: *\nPin: release a=non-free\nPin-Priority: 150\n' > /etc/apt/preferences.d/limit-non-free \ && apt update \ diff --git a/README.md b/README.md index 4f4196e..7d3c1ec 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ $ docker run --privileged -d \ |`LAN_NETWORK`| Yes (atleast one) | Comma delimited local Network's with CIDR notation |`LAN_NETWORK=192.168.0.0/24,10.10.0.0/24`|| |`ENABLE_SSL`| No | Let the container handle SSL (yes/no)? |`ENABLE_SSL=yes`|`yes`| |`NAME_SERVERS`| No | Comma delimited name servers |`NAME_SERVERS=1.1.1.1,1.0.0.1`|`1.1.1.1,1.0.0.1`| +|`LEGACY_IPTABLES`| No | Make use of iptables-legacy instead of nf_tables |`LEGACY_IPTABLES=true`|``| |`PUID`| No | UID applied to /config files and /downloads |`PUID=99`|`99`| |`PGID`| No | GID applied to /config files and /downloads |`PGID=100`|`100`| |`UMASK`| No | |`UMASK=002`|`002`| diff --git a/openvpn/start.sh b/openvpn/start.sh index 9e24389..3ee758f 100644 --- a/openvpn/start.sh +++ b/openvpn/start.sh @@ -21,15 +21,14 @@ else export VPN_ENABLED="yes" fi -#export DISABLE_IPV6=$(echo "${DISABLE_IPV6,,}") -#echo "[INFO] DISABLE_IPV6 is set to '${DISABLE_IPV6}'" | ts '%Y-%m-%d %H:%M:%.S' -#if [[ $DISABLE_IPV6 == "1" || $DISABLE_IPV6 == "true" || $DISABLE_IPV6 == "yes" || $DISABLE_IPV6 == "" ]]; then -# echo "[INFO] Disabling IPv6 in sysctl" | ts '%Y-%m-%d %H:%M:%.S' -# sysctl -w net.ipv6.conf.all.disable_ipv6=1 > /dev/null 2>&1 -#else -# echo "[INFO] Enabling IPv6 in sysctl" | ts '%Y-%m-%d %H:%M:%.S' -# sysctl -w net.ipv6.conf.all.disable_ipv6=0 > /dev/null 2>&1 -#fi +export LEGACY_IPTABLES=$(echo "${LEGACY_IPTABLES,,}") +echo "[INFO] LEGACY_IPTABLES is set to '${LEGACY_IPTABLES}'" | ts '%Y-%m-%d %H:%M:%.S' +if [[ $LEGACY_IPTABLES == "1" || $LEGACY_IPTABLES == "true" || $LEGACY_IPTABLES == "yes" ]]; then + echo "[INFO] Linking /usr/sbin/iptables-legacy to /usr/sbin/iptables" | ts '%Y-%m-%d %H:%M:%.S' + ln -sf /usr/sbin/iptables-legacy /usr/sbin/iptables > /dev/null 2>&1 +else + echo "[INFO] Not making any changes to iptables" | ts '%Y-%m-%d %H:%M:%.S' +fi if [[ $VPN_ENABLED == "yes" ]]; then # Check if VPN_TYPE is set.