From 4b1e831c1cf0ad1acec402f28b8205edf6f2890c Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 14 Jul 2026 19:36:11 +0000 Subject: [PATCH 1/2] Rebase to 3.24 --- Dockerfile | 24 ++++++++++++------------ Dockerfile.aarch64 | 24 ++++++++++++------------ README.md | 1 + readme-vars.yml | 1 + 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 61e0ca6..e87b7d8 100644 --- 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 @@ -12,13 +12,13 @@ LABEL maintainer="aptalca" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - php84-dom \ - php84-intl \ - php84-opcache \ - php84-pdo_mysql \ - php84-pdo_pgsql \ - php84-pdo_sqlite \ - php84-tokenizer && \ + php85-dom \ + php85-intl \ + php85-opcache \ + php85-pdo_mysql \ + php85-pdo_pgsql \ + php85-pdo_sqlite \ + php85-tokenizer && \ echo "**** configure nginx ****" && \ echo 'fastcgi_param PHP_AUTH_USER $remote_user; # Heimdall user authorization' >> \ /etc/nginx/fastcgi_params && \ @@ -26,11 +26,11 @@ RUN \ /etc/nginx/fastcgi_params && \ echo "**** configure php opcache ****" && \ echo 'opcache.validate_timestamps=0' >> \ - /etc/php84/conf.d/00_opcache.ini && \ + /etc/php85/conf.d/00_opcache.ini && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ - if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \ echo "**** install heimdall ****" && \ mkdir -p \ /heimdall && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 360f074..074bdc5 100644 --- 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 @@ -12,13 +12,13 @@ LABEL maintainer="aptalca" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - php84-dom \ - php84-intl \ - php84-opcache \ - php84-pdo_mysql \ - php84-pdo_pgsql \ - php84-pdo_sqlite \ - php84-tokenizer && \ + php85-dom \ + php85-intl \ + php85-opcache \ + php85-pdo_mysql \ + php85-pdo_pgsql \ + php85-pdo_sqlite \ + php85-tokenizer && \ echo "**** configure nginx ****" && \ echo 'fastcgi_param PHP_AUTH_USER $remote_user; # Heimdall user authorization' >> \ /etc/nginx/fastcgi_params && \ @@ -26,11 +26,11 @@ RUN \ /etc/nginx/fastcgi_params && \ echo "**** configure php opcache ****" && \ echo 'opcache.validate_timestamps=0' >> \ - /etc/php84/conf.d/00_opcache.ini && \ + /etc/php85/conf.d/00_opcache.ini && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ - if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \ echo "**** install heimdall ****" && \ mkdir -p \ /heimdall && \ diff --git a/README.md b/README.md index eafbf2f..e2f0811 100644 --- a/README.md +++ b/README.md @@ -295,6 +295,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **14.07.26:** - Rebase to Alpine 3.24 * **20.07.25:** - Rebase to Alpine 3.22, enable PHP environment passthrough. * **27.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **07.03.24:** - Enable the opcache and disable file revalidation. diff --git a/readme-vars.yml b/readme-vars.yml index 0a7c6f5..8f470c4 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -98,6 +98,7 @@ init_diagram: | "heimdall:latest" <- Base Images # changelog changelogs: + - {date: "14.07.26:", desc: "Rebase to Alpine 3.24"} - {date: "20.07.25:", desc: "Rebase to Alpine 3.22, enable PHP environment passthrough."} - {date: "27.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - {date: "07.03.24:", desc: "Enable the opcache and disable file revalidation."} From 9217ba9746423e5459c683bbb1f478698357fbb6 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 14 Jul 2026 19:40:30 +0000 Subject: [PATCH 2/2] Remove opcache --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e87b7d8..b9bef1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,6 @@ RUN \ apk add --no-cache \ php85-dom \ php85-intl \ - php85-opcache \ php85-pdo_mysql \ php85-pdo_pgsql \ php85-pdo_sqlite \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 074bdc5..7f4af34 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -14,7 +14,6 @@ RUN \ apk add --no-cache \ php85-dom \ php85-intl \ - php85-opcache \ php85-pdo_mysql \ php85-pdo_pgsql \ php85-pdo_sqlite \