qbittorrent:fix umask setting for 4.3.9

Author: devome

qbittorrent/Dockerfile.4.3.9

@@ -0,0 +1,75 @@
+ARG LIBTORRENT_VERSION=1
+FROM nevinee/libtorrent-rasterbar:${LIBTORRENT_VERSION} AS builder
+RUN apk upgrade \
+    && apk add --no-cache \
+       boost-dev \
+       openssl-dev \
+       qt5-qtbase-dev \
+       qt5-qttools-dev \
+       g++ \
+       cmake \
+       curl \
+       tar \
+       samurai \
+    && rm -rf /tmp/* /var/cache/apk/*
+ARG QBITTORRENT_VERSION
+RUN mkdir -p /tmp/qbittorrent \
+    && cd /tmp/qbittorrent \
+    && curl -sSL https://github.com/qbittorrent/qBittorrent/archive/refs/tags/release-${QBITTORRENT_VERSION}.tar.gz | tar xz --strip-components 1 \
+    && cmake \
+       -DCMAKE_BUILD_TYPE=Release \
+       -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
+       -DCMAKE_CXX_STANDARD=17 \
+       -DWEBUI=ON \
+       -DVERBOSE_CONFIGURE=OFF \
+       -DSTACKTRACE=OFF \
+       -DDBUS=OFF \
+       -DGUI=OFF \
+       -DQT6=OFF \
+       -Brelease \
+       -GNinja \
+    && cmake --build release -j $(nproc) \
+    && cmake --install release \
+    && ls -al /usr/local/bin/ \
+    && qbittorrent-nox --help
+RUN echo "Copy to /out" \
+    && strip /usr/local/lib/libtorrent-rasterbar.so.* \
+    && strip /usr/local/bin/qbittorrent-nox \
+    && mkdir -p /out/usr/lib /out/usr/bin \
+    && cp -d /usr/local/lib/libtorrent-rasterbar.so* /out/usr/lib \
+    && cp /usr/local/bin/qbittorrent-nox /out/usr/bin
+
+FROM alpine:latest AS app
+ENV QBT_PROFILE=/home/qbittorrent \
+    TZ=Asia/Shanghai \
+    PUID=1000 \
+    PGID=100 \
+    WEBUI_PORT=8080 \
+    BT_PORT=34567 \
+    QB_USERNAME=admin \
+    QB_PASSWORD=adminadmin \
+    LANG=zh_CN.UTF-8 \
+    SHELL=/bin/bash \
+    PS1="\u@\h:\w \$ "
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.bfsu.edu.cn/g' /etc/apk/repositories \
+    && apk add --no-cache \
+       bash \
+       busybox-suid \
+       curl \
+       jq \
+       openssl \
+       python3 \
+       qt5-qtbase \
+       shadow \
+       su-exec \
+       tini \
+       tzdata \
+    && rm -rf /tmp/* /var/cache/apk/* \
+    && ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime \
+    && echo "${TZ}" > /etc/timezone \
+    && useradd qbittorrent -u ${PUID} -U -m -d ${QBT_PROFILE} -s /sbin/nologin
+COPY --from=builder /out /
+COPY root /
+WORKDIR /data
+VOLUME ["/data"]
+ENTRYPOINT ["tini", "-g", "--", "entrypoint.sh"]

qbittorrent/root/etc/entrypoint.d/30-config.sh

@@ -3,12 +3,21 @@ QB_PASSWD_HASH=$(gen-qb-passwd "$QB_PASSWORD")
 BT_PORT=${BT_PORT:-34567}
 WEBUI_PORT=${WEBUI_PORT:-8080}
 
+major_ver=$(qbittorrent-nox --version | sed 's|qBittorrent v||' | awk -F. '{print $1}')
+minor_ver=$(qbittorrent-nox --version | sed 's|qBittorrent v||' | awk -F. '{print $2}')
+
+if [[ $major_ver -eq 4 && $minor_ver -lt 5 ]]; then
+    PAM="%I"
+else
+    PAM="%K"
+fi
+
 if [ ! -s $QB_CONF_FILE ]; then
     echo "Initializing qBittorrent configuration..."
     cat > $QB_CONF_FILE << EOF
 [AutoRun]
 enabled=true
-program=dl-finish \"%K\"
+program=dl-finish \"$PAM\"
 
 [BitTorrent]
 Session\DefaultSavePath=/data/downloads
@@ -43,11 +52,8 @@ else
     }" $QB_CONF_FILE
 fi
 
-major_ver=$(qbittorrent-nox --version | sed 's|qBittorrent v||' | awk -F. '{print $1}')
-minor_ver=$(qbittorrent-nox --version | sed 's|qBittorrent v||' | awk -F. '{print $2}')
-
-if [[ $major_ver -eq 4 && $minor_ver -ge 5 ]]; then
-    sed -i -E 's|General\\Locale=.+|General\\Locale=zh_CN|' $QB_CONF_FILE
-elif [[ $major_ver -eq 4 && $minor_ver -lt 5 ]]; then
+if [[ $major_ver -eq 4 && $minor_ver -lt 5 ]]; then
     sed -i -E 's|General\\Locale=.+|General\\Locale=zh|' $QB_CONF_FILE
+else
+    sed -i -E 's|General\\Locale=.+|General\\Locale=zh_CN|' $QB_CONF_FILE
 fi

qbittorrent/root/usr/local/bin/entrypoint.sh

@@ -11,4 +11,7 @@ fi
 crond
 
 echo "Start qbittorrent-nox..."
+if [[ -n ${UMASK_SET} ]]; then
+    umask ${UMASK_SET}
+fi
 exec su-exec "${PUID}:${PGID}" qbittorrent-nox