Rebase to 3.21 (nightly)

.github/workflows/external_trigger.yml

@@ -92,7 +92,7 @@ jobs:
             else
               printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
               echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
-              if "${artifacts_found}" == "true" ]]; then
+              if [[ "${artifacts_found}" == "true" ]]; then
                 echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
               fi
               response=$(curl -iX POST \

Dockerfile

@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:3.21
 
 # set version label
 ARG BUILD_DATE
@@ -45,7 +45,7 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ -r requirements.txt && \
   echo "**** build sab translations ****" && \
   python3 tools/make_mo.py && \
   echo "**** install par2cmdline-turbo from source ****" && \

Dockerfile.aarch64

@@ -2,7 +2,7 @@
 
 FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
 
 # set version label
 ARG BUILD_DATE
@@ -45,7 +45,7 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.21/ -r requirements.txt && \
   echo "**** build sab translations ****" && \
   python3 tools/make_mo.py && \
   echo "**** install par2cmdline-turbo from source ****" && \

Jenkinsfile

@@ -585,7 +585,7 @@ pipeline {
           --label \"org.opencontainers.image.title=Sabnzbd\" \
           --label \"org.opencontainers.image.description=[Sabnzbd](http://sabnzbd.org/) makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.\" \
           --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
-          --provenance=false --sbom=false --builder=container --load \
+          --provenance=true --sbom=true --builder=container --load \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
         sh '''#! /bin/bash
               set -e
@@ -614,7 +614,9 @@ pipeline {
                       for i in "${CACHE[@]}"; do
                         docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
                       done
-                      wait
+                      for p in $(jobs -p); do
+                        wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                      done
                     fi
                 '''
           }
@@ -649,7 +651,7 @@ pipeline {
               --label \"org.opencontainers.image.title=Sabnzbd\" \
               --label \"org.opencontainers.image.description=[Sabnzbd](http://sabnzbd.org/) makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.\" \
               --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
-              --provenance=false --sbom=false --builder=container --load \
+              --provenance=true --sbom=true --builder=container --load \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh '''#! /bin/bash
                   set -e
@@ -678,7 +680,9 @@ pipeline {
                           for i in "${CACHE[@]}"; do
                             docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
                           done
-                          wait
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
                         fi
                     '''
               }
@@ -706,7 +710,7 @@ pipeline {
               --label \"org.opencontainers.image.title=Sabnzbd\" \
               --label \"org.opencontainers.image.description=[Sabnzbd](http://sabnzbd.org/) makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an .nzb. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.\" \
               --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
-              --provenance=false --sbom=false --builder=container --load \
+              --provenance=true --sbom=true --builder=container --load \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh '''#! /bin/bash
                   set -e
@@ -735,7 +739,9 @@ pipeline {
                           for i in "${CACHE[@]}"; do
                             docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
                           done
-                          wait
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
                         fi
                     '''
               }
@@ -978,7 +984,7 @@ pipeline {
               echo '{"tag_name":"'${META_TAG}'",\
                      "target_commitish": "nightly",\
                      "name": "'${META_TAG}'",\
-                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
+                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
               printf '","draft": false,"prerelease": true}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''

README.md

@@ -63,8 +63,8 @@ This image provides various versions that are available via tags. Please read th
 
 | Tag | Available | Description |
 | :----: | :----: |--- |
-| latest | ✅ | Stable SABnzbd releases |
-| unstable | ✅ | Pre-releases from the develop branch |
+| latest | ✅ | Stable releases |
+| unstable | ✅ | Pre-release builds |
 | nightly | ✅ | Latest commits from the develop branch |
 
 ## Application Setup
@@ -306,6 +306,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **15.12.24:** - Rebase to Alpine 3.21.
 * **24.05.24:** - Rebase to Alpine 3.20.
 * **23.03.24:** - Remove nzb-notify as apprise is now directly supported.
 * **23.12.23:** - Rebase to Alpine 3.19.

readme-vars.yml

@@ -13,8 +13,8 @@ available_architectures:
 # development version
 development_versions: true
 development_versions_items:
-  - {tag: "latest", desc: "Stable SABnzbd releases"}
-  - {tag: "unstable", desc: "Pre-releases from the develop branch"}
+  - {tag: "latest", desc: "Stable releases"}
+  - {tag: "unstable", desc: "Pre-release builds"}
   - {tag: "nightly", desc: "Latest commits from the develop branch"}
 # container parameters
 common_param_env_vars_enabled: true
@@ -30,6 +30,9 @@ opt_param_volumes:
   - {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Local path for finished downloads."}
   - {vol_path: "/incomplete-downloads", vol_host_path: "/path/to/incomplete/downloads", desc: "Local path for incomplete-downloads."}
 readonly_supported: true
+noneroot_supported: true
+nonroot_message : |
+  * IPv4-only operation (i.e. with IPv6 disabled on the host) is not supported
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -89,6 +92,7 @@ init_diagram: |
   "sabnzbd:nightly" <- Base Images
 # changelog
 changelogs:
+  - {date: "15.12.24:", desc: "Rebase to Alpine 3.21."}
   - {date: "24.05.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "23.03.24:", desc: "Remove nzb-notify as apprise is now directly supported."}
   - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}

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

@@ -1,12 +1,14 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-if grep -qe ' /downloads ' /proc/mounts; then
-    lsiown abc:abc /downloads
-fi
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    if grep -qe ' /downloads ' /proc/mounts; then
+        lsiown abc:abc /downloads
+    fi
 
-if grep -qe ' /incomplete-downloads ' /proc/mounts; then
-    lsiown abc:abc /incomplete-downloads
-fi
+    if grep -qe ' /incomplete-downloads ' /proc/mounts; then
+        lsiown abc:abc /incomplete-downloads
+    fi
 
-find /config -path /config/Downloads -prune -o -exec lsiown abc:abc {} +
+    find /config -path /config/Downloads -prune -o -exec lsiown abc:abc {} +
+fi

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

@@ -3,14 +3,21 @@
 
 FAMILY=::
 
-if [ "$HAS_IPV6" = "false" ]; then
-    FAMILY=0.0.0.0
-    sed '/ip6-/d' /etc/hosts > /etc/hosts.new
-    cat /etc/hosts.new > /etc/hosts
-    rm /etc/hosts.new
-fi
+if [[ -n ${LSIO_NON_ROOT_USER} ]]; then
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 \
+            python3 /app/sabnzbd/SABnzbd.py \
+            --config-file /config --server "$FAMILY"
+else
+    if [[ "$HAS_IPV6" = "false" ]]; then
+        FAMILY=0.0.0.0
+        sed '/ip6-/d' /etc/hosts > /etc/hosts.new
+        cat /etc/hosts.new > /etc/hosts
+        rm /etc/hosts.new
+    fi
 
-exec \
-    s6-notifyoncheck -d -n 300 -w 1000 \
-        s6-setuidgid abc python3 /app/sabnzbd/SABnzbd.py \
-        --config-file /config --server "$FAMILY"
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 \
+            s6-setuidgid abc python3 /app/sabnzbd/SABnzbd.py \
+            --config-file /config --server "$FAMILY"
+fi