From e63b9b0906e5b2f2e9b26eed83751cdd65aa72f7 Mon Sep 17 00:00:00 2001 From: DyonR Date: Fri, 22 Apr 2022 01:56:45 +0200 Subject: [PATCH 1/2] Exclude alpha builds --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b2d3010..d2dcd12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -136,7 +136,7 @@ RUN apt update \ qtbase5-dev \ qttools5-dev \ zlib1g-dev \ - && QBITTORRENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/qBittorrent/qBittorrent/tags" | jq '.[] | select(.name | index ("beta") | not) | select(.name | index ("rc") | not) | .name' | head -n 1 | tr -d '"') \ + && QBITTORRENT_RELEASE=$(curl -sX GET "https://api.github.com/repos/qBittorrent/qBittorrent/tags" | jq '.[] | select(.name | index ("alpha") | not) | select(.name | index ("beta") | not) | select(.name | index ("rc") | not) | .name' | head -n 1 | tr -d '"') \ && curl -o /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz -L "https://github.com/qbittorrent/qBittorrent/archive/${QBITTORRENT_RELEASE}.tar.gz" \ && tar -xzf /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz \ && rm /opt/qBittorrent-${QBITTORRENT_RELEASE}.tar.gz \ From e47ac45cbabcacdac4f6e9ba7630839d66940cf3 Mon Sep 17 00:00:00 2001 From: "Miguel A. Vico" Date: Wed, 3 Aug 2022 14:07:03 -0700 Subject: [PATCH 2/2] Start VPN client whenever VPN_ENABLED is 1/true/yes VPN client was only started if VPN_ENABLED was "yes". However, earlier in the start.sh file preparations were done whenever VPN_ENABLED was either 1/true/yes. Using a non-string 'yes' value in docker-compose.yaml, for instance, would automatically make VPN_ENABLED take a value of "true", and that would cause the VPN client not to start, without printing any sort of warning or error. --- openvpn/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openvpn/start.sh b/openvpn/start.sh index 40fddcb..1fcd328 100644 --- a/openvpn/start.sh +++ b/openvpn/start.sh @@ -256,7 +256,7 @@ if [[ -z "${PGID}" ]]; then export PGID="root" fi -if [[ $VPN_ENABLED == "yes" ]]; then +if [[ $VPN_ENABLED == "1" || $VPN_ENABLED == "true" || $VPN_ENABLED == "yes" ]]; then if [[ "${VPN_TYPE}" == "openvpn" ]]; then echo "[INFO] Starting OpenVPN..." | ts '%Y-%m-%d %H:%M:%.S' cd /config/openvpn