From 1ab1939bc999b6593a8777f6dd3b7f9a208e4a11 Mon Sep 17 00:00:00 2001 From: thespad Date: Sat, 4 Jul 2026 14:19:27 +0000 Subject: [PATCH] Rebase to 3.24 --- Dockerfile | 6 +++--- Dockerfile.aarch64 | 6 +++--- Dockerfile.riscv64 | 6 +++--- README.md | 1 + readme-vars.yml | 1 + root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9a44cc4..b6ae86e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:latest AS unrar -FROM ghcr.io/linuxserver/baseimage-alpine:3.23 +FROM ghcr.io/linuxserver/baseimage-alpine:3.24 # set version label ARG BUILD_DATE @@ -43,8 +43,8 @@ RUN \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ - wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \ + setuptools && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.24/ -r requirements.txt && \ echo "**** build sab translations ****" && \ python3 tools/make_mo.py && \ echo "**** install par2cmdline-turbo from source ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 09479e79..34bdb1c0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:arm64v8-latest AS unrar -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.23 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.24 # set version label ARG BUILD_DATE @@ -43,8 +43,8 @@ RUN \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ - wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \ + setuptools && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.24/ -r requirements.txt && \ echo "**** build sab translations ****" && \ python3 tools/make_mo.py && \ echo "**** install par2cmdline-turbo from source ****" && \ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 index 81301604..d798c6b2 100644 --- a/Dockerfile.riscv64 +++ b/Dockerfile.riscv64 @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:riscv64-latest AS unrar -FROM ghcr.io/linuxserver/baseimage-alpine:riscv64-3.23 +FROM ghcr.io/linuxserver/baseimage-alpine:riscv64-3.24 # set version label ARG BUILD_DATE @@ -43,8 +43,8 @@ RUN \ python3 -m venv /lsiopy && \ pip install -U --no-cache-dir \ pip \ - wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.23/ -r requirements.txt && \ + setuptools && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.24/ -r requirements.txt && \ echo "**** build sab translations ****" && \ python3 tools/make_mo.py && \ echo "**** install par2cmdline-turbo from source ****" && \ diff --git a/README.md b/README.md index 024447f6..6c00b854 100644 --- a/README.md +++ b/README.md @@ -312,6 +312,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **04.07.26:** - Rebase to Alpine 3.24 * **28.12.25:** - Rebase to Alpine 3.23. Add RISCV build. * **05.07.25:** - Rebase to Alpine 3.22. * **23.12.24:** - Rebase to Alpine 3.21. diff --git a/readme-vars.yml b/readme-vars.yml index f8934ebb..85c9b5ac 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -83,6 +83,7 @@ init_diagram: | "sabnzbd:latest" <- Base Images # changelog changelogs: + - {date: "04.07.26:", desc: "Rebase to Alpine 3.24"} - {date: "28.12.25:", desc: "Rebase to Alpine 3.23. Add RISCV build."} - {date: "05.07.25:", desc: "Rebase to Alpine 3.22."} - {date: "23.12.24:", desc: "Rebase to Alpine 3.21."} diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run b/root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run index 0869f8b7..d1aeda40 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-sabnzbd/run @@ -4,7 +4,7 @@ FAMILY=:: if [[ -z ${LSIO_NON_ROOT_USER} ]]; then - if [[ "$HAS_IPV6" = "false" ]]; then + if ! test -f /proc/net/if_inet6; then FAMILY=0.0.0.0 sed '/ip6-/d' /etc/hosts > /etc/hosts.new cat /etc/hosts.new > /etc/hosts