From 174b08e94aa405b84da76302349e007f46570436 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 5 Aug 2025 11:38:55 +0100 Subject: [PATCH] Revert to 3.21 --- Dockerfile | 38 ++++++++++----------- Dockerfile.aarch64 | 38 ++++++++++----------- README.md | 1 + readme-vars.yml | 1 + root/etc/{php84 => php83}/conf.d/piwigo.ini | 2 +- 5 files changed, 41 insertions(+), 39 deletions(-) rename root/etc/{php84 => php83}/conf.d/piwigo.ini (80%) diff --git a/Dockerfile b/Dockerfile index 1f121de..a64018d 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.21 # set version label ARG BUILD_DATE @@ -18,28 +18,28 @@ RUN \ imagemagick-heic \ libjpeg-turbo-utils \ mediainfo \ - php84-apcu \ - php84-cgi \ - php84-ctype \ - php84-curl \ - php84-dom \ - php84-exif \ - php84-gd \ - php84-ldap \ - php84-mysqli \ - php84-mysqlnd \ - php84-pear \ - php84-pecl-imagick \ - php84-xsl \ - php84-zip \ + php83-apcu \ + php83-cgi \ + php83-ctype \ + php83-curl \ + php83-dom \ + php83-exif \ + php83-gd \ + php83-ldap \ + php83-mysqli \ + php83-mysqlnd \ + php83-pear \ + php83-pecl-imagick \ + php83-xsl \ + php83-zip \ poppler-utils \ re2c && \ echo "**** modify php-fpm process limits ****" && \ - sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php84/php-fpm.d/www.conf && \ + sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \ 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/php83/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf; fi && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ echo "**** download piwigo ****" && \ if [ -z ${PIWIGO_RELEASE+x} ]; then \ PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 80e0cf9..ba40cd5 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.21 # set version label ARG BUILD_DATE @@ -18,28 +18,28 @@ RUN \ imagemagick-heic \ libjpeg-turbo-utils \ mediainfo \ - php84-apcu \ - php84-cgi \ - php84-ctype \ - php84-curl \ - php84-dom \ - php84-exif \ - php84-gd \ - php84-ldap \ - php84-mysqli \ - php84-mysqlnd \ - php84-pear \ - php84-pecl-imagick \ - php84-xsl \ - php84-zip \ + php83-apcu \ + php83-cgi \ + php83-ctype \ + php83-curl \ + php83-dom \ + php83-exif \ + php83-gd \ + php83-ldap \ + php83-mysqli \ + php83-mysqlnd \ + php83-pear \ + php83-pecl-imagick \ + php83-xsl \ + php83-zip \ poppler-utils \ re2c && \ echo "**** modify php-fpm process limits ****" && \ - sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php84/php-fpm.d/www.conf && \ + sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \ 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/php83/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf; fi && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ echo "**** download piwigo ****" && \ if [ -z ${PIWIGO_RELEASE+x} ]; then \ PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \ diff --git a/README.md b/README.md index c46534c..78f98b3 100644 --- a/README.md +++ b/README.md @@ -279,6 +279,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **05.08.25:** - Revert to Alpine 3.21 due to incorrectly stated upstream support for PHP 8.4. * **27.07.25:** - Rebase to Alpine 3.22. * **31.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **07.04.24:** - Increase php workers to fix Android uploading in bulk diff --git a/readme-vars.yml b/readme-vars.yml index 40a546e..1dba021 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -83,6 +83,7 @@ init_diagram: | "piwigo:latest" <- Base Images # changelog changelogs: + - {date: "05.08.25:", desc: "Revert to Alpine 3.21 due to incorrectly stated upstream support for PHP 8.4."} - {date: "27.07.25:", desc: "Rebase to Alpine 3.22."} - {date: "31.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - {date: "07.04.24:", desc: "Increase php workers to fix Android uploading in bulk"} diff --git a/root/etc/php84/conf.d/piwigo.ini b/root/etc/php83/conf.d/piwigo.ini similarity index 80% rename from root/etc/php84/conf.d/piwigo.ini rename to root/etc/php83/conf.d/piwigo.ini index c0e06cd..b7bf634 100644 --- a/root/etc/php84/conf.d/piwigo.ini +++ b/root/etc/php83/conf.d/piwigo.ini @@ -1,4 +1,4 @@ -; /etc/php84/conf.d/piwigo.ini +; /etc/php83/conf.d/piwigo.ini ; full path comment above to help visibility when searching for php versions [PHP] upload_max_filesize = 100M