Merge pull request #94 from linuxserver/3.22-themes

Author: thespad

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" \

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" \

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.

readme-vars.yml

@@ -83,6 +83,7 @@ init_diagram: |
   "piwigo:latest" <- Base Images
 # changelog
 changelogs:
+  - {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."}

root/etc/php83/conf.d/piwigo.ini root/etc/php84/conf.d/piwigo.iniroot/etc/php83/conf.d/piwigo.ini renamed to root/etc/php84/conf.d/piwigo.ini

@@ -45,6 +45,12 @@ for i in "${symlinks[@]}"; do
     fi
 done
 
+# Update standard pages & default theme
+if [[ -d /config/www/themes ]]; then
+    cp -R /app/www/public/themes/standard_pages/ /config/www/themes/
+    cp -R /app/www/public/themes/default/ /config/www/themes/
+fi
+
 symlinks=(
     /app/www/public/language
     /app/www/public/plugins