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/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/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:edge
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
@@ -9,7 +9,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thespad"
 
 # environment settings
-ARG QBT_VERSION=1.7
 ARG UNRAR_VERSION=6.1.4
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
@@ -43,16 +42,18 @@ RUN \
   make && \
   install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/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 \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
-  curl -L \
-    -o /tmp/qbt.tar.gz \
-    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt.tar.gz" && \
+  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
+      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  curl -o \
+    /tmp/qbt.tar.gz -L \
+    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-x64-${QBT_VERSION:1}.tar.gz" && \
   tar xf \
     /tmp/qbt.tar.gz -C \
     /qbt && \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-edge
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -9,7 +9,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thespad"
 
 # environment settings
-ARG QBT_VERSION=1.7
 ARG UNRAR_VERSION=6.1.4
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
@@ -43,16 +42,18 @@ RUN \
   make && \
   install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/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 \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
-  curl -L \
-    -o /tmp/qbt.tar.gz \
-    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm64.tar.gz" && \
+  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
+      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  curl -o \
+    /tmp/qbt.tar.gz -L \
+    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-arm64-${QBT_VERSION:1}.tar.gz" && \
   tar xf \
     /tmp/qbt.tar.gz -C \
     /qbt && \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-edge
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
 
 # set version label
 ARG BUILD_DATE
@@ -9,7 +9,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thespad"
 
 # environment settings
-ARG QBT_VERSION=1.7
 ARG UNRAR_VERSION=6.1.4
 ENV HOME="/config" \
 XDG_CONFIG_HOME="/config" \
@@ -45,16 +44,18 @@ RUN \
   make && \
   install -v -m755 unrar /usr/bin && \
   if [ -z ${QBITTORRENT_VERSION+x} ]; then \
-    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/edge/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
+    QBITTORRENT_VERSION=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.16/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 \
     qbittorrent-nox==${QBITTORRENT_VERSION} && \
   echo "***** install qbitorrent-cli ****" && \
   mkdir /qbt && \
-  curl -L \
-    -o /tmp/qbt.tar.gz \
-    "https://github.com/linuxserver/docker-qbittorrent/releases/download/qbt-${QBT_VERSION}/qbt-arm.tar.gz" && \
+  QBT_VERSION=$(curl -sL "https://api.github.com/repos/fedarovich/qbittorrent-cli/releases" \
+      | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  curl -o \
+    /tmp/qbt.tar.gz -L \
+    "https://github.com/fedarovich/qbittorrent-cli/releases/download/${QBT_VERSION}/qbt-linux-alpine-arm-${QBT_VERSION:1}.tar.gz" && \
   tar xf \
     /tmp/qbt.tar.gz -C \
     /qbt && \

Jenkinsfile

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

README.md

@@ -264,6 +264,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **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.
 * **01.03.22:** - Add python for search plugin support.
 * **23.02.22:** - Rebase to Alpine Edge, install from Alpine repos.

jenkins-vars.yml

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

package_versions.txt

@@ -1,43 +1,42 @@
-alpine-baselayout-3.2.0-r20
-alpine-baselayout-data-3.2.0-r20
+alpine-baselayout-3.2.0-r22
+alpine-baselayout-data-3.2.0-r22
 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-r13
-ca-certificates-20211220-r0
-ca-certificates-bundle-20211220-r0
+busybox-1.35.0-r17
+ca-certificates-20220614-r0
+ca-certificates-bundle-20220614-r0
 coreutils-9.1-r0
-curl-7.83.1-r1
+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
 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
 libattr-2.5.1-r1
 libb2-0.98.1-r2
 libblkid-2.38-r1
-libbsd-0.11.6-r2
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1o-r0
-libcurl-7.83.1-r1
+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
-libmd-1.0.4-r0
 libmount-2.38-r1
-libpcre2-16-10.39-r0
+libpcre2-16-10.40-r0
 libproc-3.3.17-r1
 libsm-1.2.3-r0
-libssl1.1-1.1.1o-r0
+libssl1.1-1.1.1q-r0
 libstdc++-11.2.1_git20220219-r2
 libtorrent-rasterbar-2.0.6-r1
 libuuid-2.38-r1
@@ -52,22 +51,22 @@ linux-pam-1.5.2-r0
 mpdecimal-2.5.1-r1
 musl-1.2.3-r0
 musl-utils-1.2.3-r0
-ncurses-libs-6.3_p20220423-r0
-ncurses-terminfo-base-6.3_p20220423-r0
+ncurses-libs-6.3_p20220521-r0
+ncurses-terminfo-base-6.3_p20220521-r0
 nghttp2-libs-1.47.0-r0
-openssl-1.1.1o-r0
+openssl-1.1.1q-r0
 p7zip-17.04-r2
 pcre-8.45-r2
 procps-3.3.17-r1
-python3-3.10.4-r0
-qbittorrent-nox-4.4.3-r0
+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
 shadow-4.10-r3
 skalibs-2.11.2.0-r0
 sqlite-libs-3.38.5-r0
-ssl_client-1.35.0-r13
+ssl_client-1.35.0-r17
 tzdata-2022a-r0
 utmps-libs-0.1.2.0-r0
 xdg-utils-1.1.3-r3
@@ -75,5 +74,5 @@ 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-r1
+zlib-1.2.12-r2
 zstd-libs-1.5.2-r1

readme-vars.yml

@@ -69,6 +69,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { 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." }
   - { date: "01.03.22:", desc: "Add python for search plugin support." }
   - { date: "23.02.22:", desc: "Rebase to Alpine Edge, install from Alpine repos." }