use vpn base

hotio · Jan 23, 2024 · 7515db4 · 7515db4
1 parent 8238296
commit 7515db4
Show file tree

Hide file tree

Showing 43 changed files with 28 additions and 337 deletions.
diff --git a/VERSION.json b/VERSION.json
@@ -6,9 +6,9 @@
   "vuetorrent_version": "2.5.0",
   "changelog": "https://github.com/qbittorrent/qbittorrent/compare/release-4.6.2...release-4.6.3",
   "upstream_image": "ghcr.io/hotio/base",
-  "upstream_tag": "alpine",
-  "upstream_digest_amd64": "sha256:aba1ad70d73a01a04940ceefcc0506c8867aa99be1e1598f7f57d79dc462ba1d",
-  "upstream_digest_arm64": "sha256:5f44dcee2c34486af761dca45b1a7b57ef953ee485050544c2255c6f21ed0278",
+  "upstream_tag": "alpinevpn",
+  "upstream_digest_amd64": "sha256:e8c549548c101b12abc2fc9399c6c6dc33e5d56603e01f6e3e23fed42d08d54a",
+  "upstream_digest_arm64": "sha256:b4fca2fdedc503aaa5f73aa1483c442d0ba03113bd359a0ab47ed75a33e5bd9b",
   "test_url": "http://localhost:8080",
   "nightwalker_version": "2301b1cc436d802abe1e2cb6f132dff12e40157b"
 }
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
@@ -3,18 +3,11 @@ ARG UPSTREAM_DIGEST_AMD64
 
 FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_AMD64}
 EXPOSE 8080
-ENV VPN_ENABLED="false" VPN_PROVIDER="generic" VPN_LAN_NETWORK="" VPN_CONF="wg0" VPN_ADDITIONAL_PORTS="" WEBUI_PORTS="8080/tcp,8080/udp" PRIVOXY_ENABLED="false" S6_SERVICES_GRACETIME=180000 S6_STAGE2_HOOK="/init-hook"
-
-VOLUME ["${CONFIG_DIR}"]
+ENV WEBUI_PORTS="8080/tcp,8080/udp"
 
 RUN ln -s "${CONFIG_DIR}" "${APP_DIR}/qBittorrent"
 
-RUN apk add --no-cache privoxy iptables ip6tables iproute2 openresolv wireguard-tools ipcalc && \
-    apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing wireguard-go && \
-    apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community libnatpmp
-
 ARG FULL_VERSION
-
 RUN curl -fsSL "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${FULL_VERSION}/x86_64-qbittorrent-nox" > "${APP_DIR}/qbittorrent-nox" && \
     chmod 755 "${APP_DIR}/qbittorrent-nox"
 
@@ -30,4 +23,3 @@ RUN mkdir "${APP_DIR}/nightwalker" && \
     chmod -R u=rwX,go=rX "${APP_DIR}/nightwalker"
 
 COPY root/ /
-RUN chmod +x /init-hook
diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
@@ -3,18 +3,11 @@ ARG UPSTREAM_DIGEST_ARM64
 
 FROM ${UPSTREAM_IMAGE}@${UPSTREAM_DIGEST_ARM64}
 EXPOSE 8080
-ENV VPN_ENABLED="false" VPN_PROVIDER="generic" VPN_LAN_NETWORK="" VPN_CONF="wg0" VPN_ADDITIONAL_PORTS="" WEBUI_PORTS="8080/tcp,8080/udp" PRIVOXY_ENABLED="false" S6_SERVICES_GRACETIME=180000 S6_STAGE2_HOOK="/init-hook"
-
-VOLUME ["${CONFIG_DIR}"]
+ENV WEBUI_PORTS="8080/tcp,8080/udp"
 
 RUN ln -s "${CONFIG_DIR}" "${APP_DIR}/qBittorrent"
 
-RUN apk add --no-cache privoxy iptables ip6tables iproute2 openresolv wireguard-tools ipcalc && \
-    apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing wireguard-go && \
-    apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community libnatpmp
-
 ARG FULL_VERSION
-
 RUN curl -fsSL "https://github.com/userdocs/qbittorrent-nox-static/releases/download/${FULL_VERSION}/aarch64-qbittorrent-nox" > "${APP_DIR}/qbittorrent-nox" && \
     chmod 755 "${APP_DIR}/qbittorrent-nox"
 
@@ -30,4 +23,3 @@ RUN mkdir "${APP_DIR}/nightwalker" && \
     chmod -R u=rwX,go=rX "${APP_DIR}/nightwalker"
 
 COPY root/ /
-RUN chmod +x /init-hook
diff --git a/root/app/privoxy.conf b/root/app/privoxy.conf
diff --git a/root/app/proton_update_app b/root/app/proton_update_app
@@ -1,4 +1,7 @@
 # shellcheck shell=bash
+until pidof qbittorrent-nox > /dev/null; do   
+    sleep 1
+done
 webui_https="http"
 if grep -q 'WebUI\\HTTPS\\Enabled=true' "${CONFIG_DIR}/config/qBittorrent.conf"; then
     webui_https="https"

diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/up b/root/etc/s6-overlay/s6-rc.d/init-perms/up
diff --git a/root/etc/s6-overlay/s6-rc.d/init-privoxy/dependencies.d/init-wireguard b/root/etc/s6-overlay/s6-rc.d/init-privoxy/dependencies.d/init-wireguard
diff --git a/root/etc/s6-overlay/s6-rc.d/init-privoxy/run b/root/etc/s6-overlay/s6-rc.d/init-privoxy/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-privoxy/type b/root/etc/s6-overlay/s6-rc.d/init-privoxy/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-privoxy/up b/root/etc/s6-overlay/s6-rc.d/init-privoxy/up
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/dependencies.d/init-perms b/root/etc/s6-overlay/s6-rc.d/init-secrets/dependencies.d/init-perms
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/run b/root/etc/s6-overlay/s6-rc.d/init-secrets/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/type b/root/etc/s6-overlay/s6-rc.d/init-secrets/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/up b/root/etc/s6-overlay/s6-rc.d/init-secrets/up
diff --git a/.../init-wireguard/dependencies.d/init-setup → .../init-setup-app/dependencies.d/init-setup b/.../init-wireguard/dependencies.d/init-setup → .../init-setup-app/dependencies.d/init-setup
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup-app/run b/root/etc/s6-overlay/s6-rc.d/init-setup-app/run
@@ -0,0 +1,19 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+umask "${UMASK}"
+
+echo "
+----------------------------------------------------------------------
+ENVIRONMENT APP
+----------------------------------------------------------------------
+WEBUI_PORTS=${WEBUI_PORTS}
+----------------------------------------------------------------------
+"
+
+if [[ ! -f "${CONFIG_DIR}/config/qBittorrent.conf" ]]; then
+    echo "Installing default \"qBittorrent.conf\"..."
+    mkdir -p "${CONFIG_DIR}/config"
+    cp "${APP_DIR}/qBittorrent.conf" "${CONFIG_DIR}/config/qBittorrent.conf"
+    chown hotio:hotio -R "${CONFIG_DIR}/config"
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/type → ...tc/s6-overlay/s6-rc.d/init-setup-app/type b/root/etc/s6-overlay/s6-rc.d/init-perms/type → ...tc/s6-overlay/s6-rc.d/init-setup-app/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup-app/up b/root/etc/s6-overlay/s6-rc.d/init-setup-app/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-setup-app/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/dependencies.d/init-secrets b/root/etc/s6-overlay/s6-rc.d/init-setup/dependencies.d/init-secrets
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/run b/root/etc/s6-overlay/s6-rc.d/init-setup/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/type b/root/etc/s6-overlay/s6-rc.d/init-setup/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/up b/root/etc/s6-overlay/s6-rc.d/init-setup/up
diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/down b/root/etc/s6-overlay/s6-rc.d/init-wireguard/down
diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/run.down b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run.down
diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/run.up b/root/etc/s6-overlay/s6-rc.d/init-wireguard/run.up
diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/type b/root/etc/s6-overlay/s6-rc.d/init-wireguard/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-wireguard/up b/root/etc/s6-overlay/s6-rc.d/init-wireguard/up
diff --git a/root/etc/s6-overlay/s6-rc.d/service-privoxy/dependencies.d/init-privoxy b/root/etc/s6-overlay/s6-rc.d/service-privoxy/dependencies.d/init-privoxy
diff --git a/root/etc/s6-overlay/s6-rc.d/service-privoxy/run b/root/etc/s6-overlay/s6-rc.d/service-privoxy/run
diff --git a/root/etc/s6-overlay/s6-rc.d/service-privoxy/type b/root/etc/s6-overlay/s6-rc.d/service-privoxy/type
diff --git a/root/etc/s6-overlay/s6-rc.d/service-proton/dependencies.d/service-qbittorrent b/root/etc/s6-overlay/s6-rc.d/service-proton/dependencies.d/service-qbittorrent
diff --git a/root/etc/s6-overlay/s6-rc.d/service-proton/finish b/root/etc/s6-overlay/s6-rc.d/service-proton/finish