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
@@ -42,7 +42,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/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 \

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
@@ -42,7 +42,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/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 \

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
@@ -44,7 +44,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/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 \

Jenkinsfile

@@ -25,8 +25,8 @@ pipeline {
     DEV_DOCKERHUB_IMAGE = 'lsiodev/qbittorrent'
     PR_DOCKERHUB_IMAGE = 'lspipepr/qbittorrent'
     DIST_IMAGE = 'alpine'
-    DIST_TAG = 'edge'
+    DIST_TAG = '3.16'
-    DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
+    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,7 @@ 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.

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_TAG = '3.16'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/edge/community/'
+  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.16/community/'
   - DIST_REPO_PACKAGES = 'qbittorrent-nox'
   - MULTIARCH='true'
   - CI='true'

package_versions.txt

@@ -1,10 +1,10 @@
-alpine-baselayout-3.2.0-r21
+alpine-baselayout-3.2.0-r22
-alpine-baselayout-data-3.2.0-r21
+alpine-baselayout-data-3.2.0-r22
 alpine-keys-2.4-r1
-apk-tools-2.12.10-r0
+apk-tools-2.12.9-r3
 bash-5.1.16-r2
 brotli-libs-1.0.9-r6
-busybox-1.35.0-r15
+busybox-1.35.0-r14
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-9.1-r0
@@ -12,8 +12,10 @@ curl-7.83.1-r1
 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.2-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
@@ -27,35 +29,50 @@ libcurl-7.83.1-r1
 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
 libpcre2-16-10.40-r0
 libproc-3.3.17-r1
+libsm-1.2.3-r0
 libssl1.1-1.1.1o-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
 mpdecimal-2.5.1-r1
 musl-1.2.3-r0
 musl-utils-1.2.3-r0
-ncurses-libs-6.3_p20220604-r0
+ncurses-libs-6.3_p20220521-r0
-ncurses-terminfo-base-6.3_p20220604-r0
+ncurses-terminfo-base-6.3_p20220521-r0
 nghttp2-libs-1.47.0-r0
 openssl-1.1.1o-r0
 p7zip-17.04-r2
 pcre-8.45-r2
 procps-3.3.17-r1
-python3-3.10.5-r0
+python3-3.10.4-r0
 qbittorrent-nox-4.4.3.1-r1
-qt6-qtbase-6.3.0-r2
+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-r15
+ssl_client-1.35.0-r14
-tzdata-2022a-r1
+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-r1
+zstd-libs-1.5.2-r1

readme-vars.yml

@@ -69,6 +69,7 @@ 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." }