From 415fbce955691ecc5ace734c9eae8b17c0b214a7 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 19 Jul 2026 20:02:36 -0500 Subject: [PATCH 1/2] Rebase to 3.24 Signed-off-by: Eric Nemchik --- Dockerfile | 64 +++++++++++++++++++++++----------------------- Dockerfile.aarch64 | 64 +++++++++++++++++++++++----------------------- readme-vars.yml | 1 + 3 files changed, 65 insertions(+), 64 deletions(-) diff --git a/Dockerfile b/Dockerfile index 02135956..461683b4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.24 # set version label ARG BUILD_DATE @@ -49,36 +49,36 @@ RUN \ nginx-mod-stream \ nginx-mod-stream-geoip2 \ nginx-vim \ - php84-bcmath \ - php84-bz2 \ - php84-dom \ - php84-exif \ - php84-ftp \ - php84-gd \ - php84-gmp \ - php84-imap \ - php84-intl \ - php84-ldap \ - php84-mysqli \ - php84-mysqlnd \ - php84-opcache \ - php84-pdo_mysql \ - php84-pdo_odbc \ - php84-pdo_pgsql \ - php84-pdo_sqlite \ - php84-pear \ - php84-pecl-apcu \ - php84-pecl-memcached \ - php84-pecl-redis \ - php84-pgsql \ - php84-posix \ - php84-soap \ - php84-sockets \ - php84-sodium \ - php84-sqlite3 \ - php84-tokenizer \ - php84-xmlreader \ - php84-xsl \ + php85-bcmath \ + php85-bz2 \ + php85-dom \ + php85-exif \ + php85-ftp \ + php85-gd \ + php85-gmp \ + php85-imap \ + php85-intl \ + php85-ldap \ + php85-mysqli \ + php85-mysqlnd \ + php85-opcache \ + php85-pdo_mysql \ + php85-pdo_odbc \ + php85-pdo_pgsql \ + php85-pdo_sqlite \ + php85-pear \ + php85-pecl-apcu \ + php85-pecl-memcached \ + php85-pecl-redis \ + php85-pgsql \ + php85-posix \ + php85-soap \ + php85-sockets \ + php85-sodium \ + php85-sqlite3 \ + php85-tokenizer \ + php85-xmlreader \ + php85-xsl \ whois && \ echo "**** install certbot plugins ****" && \ if [ -z ${CERTBOT_VERSION+x} ]; then \ @@ -88,7 +88,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.22/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.24/ \ certbot==${CERTBOT_VERSION} \ certbot-dns-acmedns \ certbot-dns-aliyun \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index aeaf4cd8..aa67e60a 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.24 # set version label ARG BUILD_DATE @@ -49,36 +49,36 @@ RUN \ nginx-mod-stream \ nginx-mod-stream-geoip2 \ nginx-vim \ - php84-bcmath \ - php84-bz2 \ - php84-dom \ - php84-exif \ - php84-ftp \ - php84-gd \ - php84-gmp \ - php84-imap \ - php84-intl \ - php84-ldap \ - php84-mysqli \ - php84-mysqlnd \ - php84-opcache \ - php84-pdo_mysql \ - php84-pdo_odbc \ - php84-pdo_pgsql \ - php84-pdo_sqlite \ - php84-pear \ - php84-pecl-apcu \ - php84-pecl-memcached \ - php84-pecl-redis \ - php84-pgsql \ - php84-posix \ - php84-soap \ - php84-sockets \ - php84-sodium \ - php84-sqlite3 \ - php84-tokenizer \ - php84-xmlreader \ - php84-xsl \ + php85-bcmath \ + php85-bz2 \ + php85-dom \ + php85-exif \ + php85-ftp \ + php85-gd \ + php85-gmp \ + php85-imap \ + php85-intl \ + php85-ldap \ + php85-mysqli \ + php85-mysqlnd \ + php85-opcache \ + php85-pdo_mysql \ + php85-pdo_odbc \ + php85-pdo_pgsql \ + php85-pdo_sqlite \ + php85-pear \ + php85-pecl-apcu \ + php85-pecl-memcached \ + php85-pecl-redis \ + php85-pgsql \ + php85-posix \ + php85-soap \ + php85-sockets \ + php85-sodium \ + php85-sqlite3 \ + php85-tokenizer \ + php85-xmlreader \ + php85-xsl \ whois && \ echo "**** install certbot plugins ****" && \ if [ -z ${CERTBOT_VERSION+x} ]; then \ @@ -88,7 +88,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.22/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.24/ \ certbot==${CERTBOT_VERSION} \ certbot-dns-acmedns \ certbot-dns-aliyun \ diff --git a/readme-vars.yml b/readme-vars.yml index 5c3a9635..5c7d2701 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -220,6 +220,7 @@ init_diagram: | "swag:latest" <- Base Images # changelog changelogs: + - {date: "19.07.26:", desc: "Rebase to Alpine 3.24 with PHP 8.5."} - {date: "10.07.26:", desc: "Add support for Let's Encrypt cert profiles. Run certbot twice daily with a random delay."} - {date: "19.06.26:", desc: "Add support for mijn.host dns validation."} - {date: "01.06.26:", desc: "Remove obsolete old cert check logic."} From fb016e60ee460a124a78742ce416aa8308aa82ee Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 19 Jul 2026 21:13:30 -0500 Subject: [PATCH 2/2] Remove unnecessary PHP extensions from Dockerfiles Signed-off-by: Eric Nemchik --- Dockerfile | 2 -- Dockerfile.aarch64 | 2 -- 2 files changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 461683b4..21f8b4f8 100755 --- a/Dockerfile +++ b/Dockerfile @@ -56,12 +56,10 @@ RUN \ php85-ftp \ php85-gd \ php85-gmp \ - php85-imap \ php85-intl \ php85-ldap \ php85-mysqli \ php85-mysqlnd \ - php85-opcache \ php85-pdo_mysql \ php85-pdo_odbc \ php85-pdo_pgsql \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index aa67e60a..92786b04 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -56,12 +56,10 @@ RUN \ php85-ftp \ php85-gd \ php85-gmp \ - php85-imap \ php85-intl \ php85-ldap \ php85-mysqli \ php85-mysqlnd \ - php85-opcache \ php85-pdo_mysql \ php85-pdo_odbc \ php85-pdo_pgsql \