Bot Updating Package Versions

.github/workflows/external_trigger.yml

@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_QBITTORRENT_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
             && awk '/^P:'"qbittorrent-nox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+FROM ghcr.io/linuxserver/baseimage-alpine:edge
 
 # set version label
 ARG BUILD_DATE
@@ -9,7 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thespad"
 
 # environment settings
-ARG UNRAR_VERSION=6.1.4
+ARG UNRAR_VERSION=6.1.7
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
@@ -23,8 +23,6 @@ RUN \
     gcc && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
-    bash \
-    curl \
     icu-libs \
     libstdc++ \
     openssl \
@@ -42,7 +40,7 @@ RUN \
   make && \
   install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
 
 # set version label
 ARG BUILD_DATE
@@ -9,7 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thespad"
 
 # environment settings
-ARG UNRAR_VERSION=6.1.4
+ARG UNRAR_VERSION=6.1.7
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
@@ -23,8 +23,6 @@ RUN \
     gcc && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
-    bash \
-    curl \
     icu-libs \
     libstdc++ \
     openssl \
@@ -42,7 +40,7 @@ RUN \
   make && \
   install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-edge
 
 # set version label
 ARG BUILD_DATE
@@ -9,7 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thespad"
 
 # environment settings
-ARG UNRAR_VERSION=6.1.4
+ARG UNRAR_VERSION=6.1.7
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
 XDG_DATA_HOME="/config"
@@ -23,9 +23,6 @@ RUN \
     gcc && \
   echo "**** install packages ****" && \
   apk add -U --update --no-cache \
-    bash \
-    curl \
-    gcompat \
     icu-libs \
     libc6-compat \
     libstdc++ \
@@ -44,7 +41,7 @@ RUN \
   make && \
   install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
     && awk '/^P:qbittorrent-nox$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
   fi && \
   apk add -U --upgrade --no-cache \

Jenkinsfile

@@ -25,8 +25,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
     PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = '3.16'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/'
+    DIST_TAG = 'edge'
+    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
     DIST_REPO_PACKAGES = 'qbittorrent-nox'
     MULTIARCH='true'
     CI='true'
@@ -714,7 +714,7 @@ pipeline {
                 -e DO_REGION="ams3" \
                 -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
-                python /ci/ci.py'''
+                python3 test_build.py'''
         }
       }
     }

README.md

@@ -72,7 +72,6 @@ The webui is at `<your-ip>:8080` and the default username/password is `admin/adm
 
 Change username/password via the webui in the webui section of settings.  
 
-
 ### WEBUI_PORT variable
 
 Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
@@ -85,7 +84,7 @@ If you have no webui , check the file /config/qBittorrent/qBittorrent.conf
 
 edit or add the following lines  
 
-```
+```text
 WebUI\Address=*
 
 WebUI\ServerDomains=*
@@ -264,6 +263,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.08.22:** - Rebase to Alpine Edge again to follow latest releases.
+* **12.08.22:** - Bump unrar to 6.1.7.
 * **16.06.22:** - Rebase to Alpine 3.16 from edge.
 * **25.05.22:** - Fetch qbitorrent-cli from upstream repo.
 * **02.03.22:** - Add unrar, 7zip, and qbitorrent-cli.

jenkins-vars.yml

@@ -15,8 +15,8 @@ repo_vars:
   - DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
   - PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
   - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.16'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/'
+  - DIST_TAG = 'edge'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
   - DIST_REPO_PACKAGES = 'qbittorrent-nox'
   - MULTIARCH='true'
   - CI='true'

package_versions.txt

@@ -1,78 +1,64 @@
-alpine-baselayout-3.2.0-r22
-alpine-baselayout-data-3.2.0-r22
+alpine-baselayout-3.3.0-r2
+alpine-baselayout-data-3.3.0-r2
 alpine-keys-2.4-r1
-apk-tools-2.12.9-r3
-bash-5.1.16-r2
-brotli-libs-1.0.9-r6
-busybox-1.35.0-r17
-ca-certificates-20220614-r0
-ca-certificates-bundle-20220614-r0
+apk-tools-2.12.9-r7
+bash-5.2.2-r0
+brotli-libs-1.0.9-r8
+busybox-1.35.0-r27
+busybox-binsh-1.35.0-r27
+ca-certificates-20220614-r2
+ca-certificates-bundle-20220614-r2
 coreutils-9.1-r0
-curl-7.83.1-r2
-dbus-libs-1.14.0-r1
-double-conversion-3.1.5-r0
-expat-2.4.8-r0
-file-5.41-r0
+curl-7.85.0-r0
+dbus-libs-1.14.4-r0
+double-conversion-3.2.1-r0
 gdbm-1.23-r0
-glib-2.72.1-r0
-gmp-6.2.1-r2
-icu-data-en-71.1-r2
-icu-libs-71.1-r2
-libacl-2.3.1-r0
+glib-2.74.0-r4
+icu-data-en-72.1-r1
+icu-libs-72.1-r1
+jq-1.6-r1
+libacl-2.3.1-r1
 libattr-2.5.1-r1
 libb2-0.98.1-r2
-libblkid-2.38-r1
-libbz2-1.0.8-r1
+libblkid-2.38.1-r0
+libbz2-1.0.8-r3
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1q-r0
-libcurl-7.83.1-r2
-libffi-3.4.2-r1
-libgcc-11.2.1_git20220219-r2
-libgomp-11.2.1_git20220219-r2
-libice-1.0.10-r0
-libintl-0.21-r2
-libmagic-5.41-r0
-libmount-2.38-r1
+libcrypto3-3.0.5-r3
+libcurl-7.85.0-r0
+libexpat-2.4.9-r0
+libffi-3.4.3-r0
+libgcc-12.2.1_git20220924-r3
+libgomp-12.2.1_git20220924-r3
+libintl-0.21.1-r1
+libmount-2.38.1-r0
 libpcre2-16-10.40-r0
-libproc-3.3.17-r1
-libsm-1.2.3-r0
-libssl1.1-1.1.1q-r0
-libstdc++-11.2.1_git20220219-r2
-libtorrent-rasterbar-2.0.6-r1
-libuuid-2.38-r1
-libx11-1.8-r0
-libxau-1.0.9-r0
-libxcb-1.15-r0
-libxdmcp-1.1.3-r0
-libxext-1.3.4-r0
-libxmu-1.1.3-r0
-libxt-1.2.1-r0
-linux-pam-1.5.2-r0
+libproc-3.3.17-r2
+libssl3-3.0.5-r3
+libstdc++-12.2.1_git20220924-r3
+libtorrent-rasterbar-2.0.8-r0
+linux-pam-1.5.2-r1
 mpdecimal-2.5.1-r1
-musl-1.2.3-r0
-musl-utils-1.2.3-r0
-ncurses-libs-6.3_p20220521-r0
-ncurses-terminfo-base-6.3_p20220521-r0
-nghttp2-libs-1.47.0-r0
-openssl-1.1.1q-r0
-p7zip-17.04-r2
-pcre-8.45-r2
-procps-3.3.17-r1
-python3-3.10.5-r0
-qbittorrent-nox-4.4.3.1-r1
-qt6-qtbase-6.3.0-r1
-readline-8.1.2-r0
-scanelf-1.3.4-r0
+musl-1.2.3-r1
+musl-utils-1.2.3-r1
+ncurses-libs-6.3_p20221008-r0
+ncurses-terminfo-base-6.3_p20221008-r0
+nghttp2-libs-1.50.0-r0
+oniguruma-6.9.8-r0
+openssl-3.0.5-r3
+p7zip-17.04-r3
+pcre2-10.40-r0
+procps-3.3.17-r2
+python3-3.10.8-r1
+qbittorrent-nox-4.4.5-r2
+qt6-qtbase-6.4.0-r1
+readline-8.2.0-r0
+scanelf-1.3.5-r1
 shadow-4.10-r3
-skalibs-2.11.2.0-r0
-sqlite-libs-3.38.5-r0
-ssl_client-1.35.0-r17
-tzdata-2022a-r0
-utmps-libs-0.1.2.0-r0
-xdg-utils-1.1.3-r3
-xprop-1.2.5-r0
-xset-1.2.4-r0
-xz-5.2.5-r1
-xz-libs-5.2.5-r1
-zlib-1.2.12-r2
-zstd-libs-1.5.2-r1
+skalibs-2.12.0.1-r0
+sqlite-libs-3.39.4-r0
+ssl_client-1.35.0-r27
+tzdata-2022e-r0
+utmps-libs-0.1.2.0-r1
+xz-5.2.7-r0
+xz-libs-5.2.7-r0
+zlib-1.2.13-r0

readme-vars.yml

@@ -46,7 +46,6 @@ app_setup_block: |
   
   Change username/password via the webui in the webui section of settings.  
 
-
   ### WEBUI_PORT variable
   
   Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the -p 8080 switch AND set the WEBUI_PORT variable to the new port.  
@@ -59,7 +58,7 @@ app_setup_block: |
   
   edit or add the following lines  
 
-  ```
+  ```text
   WebUI\Address=*
   
   WebUI\ServerDomains=*
@@ -69,6 +68,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.08.22:", desc: "Rebase to Alpine Edge again to follow latest releases." }
+  - { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
   - { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }
   - { date: "25.05.22:", desc: "Fetch qbitorrent-cli from upstream repo." }
   - { date: "02.03.22:", desc: "Add unrar, 7zip, and qbitorrent-cli." }

root/etc/cont-init.d/30-config

@@ -1,26 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# make our folder
-mkdir -p /config/qBittorrent
-
-# copy config
-[[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \
-    cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
-
-# v4.3.3 BT_backup migration
-[[ -d /config/data/qBittorrent/BT_backup/ ]] && \
-    mv /config/qBittorrent/BT_backup/ /config/qBittorrent/BT_backup.bak/ && \
-    mkdir /config/qBittorrent/BT_backup/ && \
-    cp -a /config/data/qBittorrent/BT_backup/.  /config/qBittorrent/BT_backup/ && \
-    mv /config/data/qBittorrent/BT_backup/ /config/data/qBittorrent/BT_backup.old/
-
-# chown download directory if currently not set to abc
-if [[ -d /downloads ]]; then
-    if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
-        chown -R abc:abc /downloads
-    fi
-fi
-
-# permissions
-chown -R abc:abc \
-    /config

root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run

@@ -0,0 +1,20 @@
+#!/usr/bin/with-contenv bash
+
+# make our folder
+mkdir -p /config/qBittorrent
+
+# copy default config
+if [[ ! -f /config/qBittorrent/qBittorrent.conf ]]; then
+    cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf
+fi
+
+# chown download directory if currently not set to abc
+if [[ -d /downloads ]]; then
+    if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then
+        chown -R abc:abc /downloads
+    fi
+fi
+
+# permissions
+chown -R abc:abc \
+    /config

root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-qbittorrent-config/run

root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/notification-fd

@@ -0,0 +1 @@
+3

root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/run

@@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bash
+
+WEBUI_PORT=${WEBUI_PORT:-8080}
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \
+        s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"

root/etc/s6-overlay/s6-rc.d/svc-qbittorrent/type

@@ -0,0 +1 @@
+longrun

root/etc/services.d/qbittorrent/run

@@ -1,6 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-WEBUI_PORT=${WEBUI_PORT:-8080}
-
-exec \
-    s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"