From f246caefd3715dfa617dd17163ba6f48cefbbe1f Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 4 Jan 2026 18:33:18 +0000 Subject: [PATCH 1/3] Rebease to 3.22, always update default themes --- Dockerfile | 38 +++++++++---------- Dockerfile.aarch64 | 38 +++++++++---------- README.md | 1 + readme-vars.yml | 1 + root/etc/{php83 => php84}/conf.d/piwigo.ini | 0 .../s6-overlay/s6-rc.d/init-piwigo-config/run | 6 +++ 6 files changed, 46 insertions(+), 38 deletions(-) rename root/etc/{php83 => php84}/conf.d/piwigo.ini (100%) diff --git a/Dockerfile b/Dockerfile index a64018d..1f121de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22 # set version label ARG BUILD_DATE @@ -18,28 +18,28 @@ RUN \ imagemagick-heic \ libjpeg-turbo-utils \ mediainfo \ - 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 \ + 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 \ poppler-utils \ re2c && \ echo "**** modify php-fpm process limits ****" && \ - sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \ + sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php84/php-fpm.d/www.conf && \ echo "**** configure php-fpm to pass env vars ****" && \ - 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 && \ + 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 && \ 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 ba40cd5..80e0cf9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22 # set version label ARG BUILD_DATE @@ -18,28 +18,28 @@ RUN \ imagemagick-heic \ libjpeg-turbo-utils \ mediainfo \ - 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 \ + 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 \ poppler-utils \ re2c && \ echo "**** modify php-fpm process limits ****" && \ - sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \ + sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php84/php-fpm.d/www.conf && \ echo "**** configure php-fpm to pass env vars ****" && \ - 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 && \ + 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 && \ 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 78f98b3..54aeb5c 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 +* **04.01.25:** - Rebase to Alpine 3.22, always update default theme on startup. * **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. diff --git a/readme-vars.yml b/readme-vars.yml index 45be57a..31463fa 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -83,6 +83,7 @@ init_diagram: | "piwigo:latest" <- Base Images # changelog changelogs: + - {date: "04.01.25:", desc: "Rebase to Alpine 3.22, always update default theme on startup."} - {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."} diff --git a/root/etc/php83/conf.d/piwigo.ini b/root/etc/php84/conf.d/piwigo.ini similarity index 100% rename from root/etc/php83/conf.d/piwigo.ini rename to root/etc/php84/conf.d/piwigo.ini diff --git a/root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run b/root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run index dbe4d03..2aeab1a 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run @@ -45,6 +45,12 @@ for i in "${symlinks[@]}"; do fi done +# Update standard pages & default theme +if [[ -d /config/www/themes ]]; then + mv -f /app/www/public/themes/standard_pages/ /config/www/themes/ + mv -f /app/www/public/themes/default/ /config/www/themes/ +fi + symlinks=( /app/www/public/language /app/www/public/plugins From 27e3b0494469bb0858fbd47b45464c6088184ad6 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 4 Jan 2026 18:40:28 +0000 Subject: [PATCH 2/3] Copy rather than move --- root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run b/root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run index 2aeab1a..6fc7882 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run @@ -47,8 +47,8 @@ done # Update standard pages & default theme if [[ -d /config/www/themes ]]; then - mv -f /app/www/public/themes/standard_pages/ /config/www/themes/ - mv -f /app/www/public/themes/default/ /config/www/themes/ + cp -R /app/www/public/themes/standard_pages/ /config/www/themes/ + cp -R /app/www/public/themes/default/ /config/www/themes/ fi symlinks=( From 4266adb5e721d359357ffe87c8a621ecf32e177b Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 4 Jan 2026 19:03:07 +0000 Subject: [PATCH 3/3] 2026 --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 31463fa..aaf7617 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -83,7 +83,7 @@ init_diagram: | "piwigo:latest" <- Base Images # changelog changelogs: - - {date: "04.01.25:", desc: "Rebase to Alpine 3.22, always update default theme on startup."} + - {date: "04.01.26:", desc: "Rebase to Alpine 3.22, always update default theme on startup."} - {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."}