Merge pull request #59 from linuxserver/3.17

Rebase to alpine 3.17 with php8.1

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -15,25 +17,25 @@ RUN \
     imagemagick \
     libjpeg-turbo-utils \
     mediainfo \
-    php8-apcu \
-    php8-cgi \
-    php8-ctype \
-    php8-curl \
-    php8-dom \
-    php8-exif \
-    php8-gd \
-    php8-ldap \
-    php8-mysqli \
-    php8-mysqlnd \
-    php8-pear \
-    php8-pecl-imagick \
-    php8-xsl \
-    php8-zip \
+    php81-apcu \
+    php81-cgi \
+    php81-ctype \
+    php81-curl \
+    php81-dom \
+    php81-exif \
+    php81-gd \
+    php81-ldap \
+    php81-mysqli \
+    php81-mysqlnd \
+    php81-pear \
+    php81-pecl-imagick \
+    php81-xsl \
+    php81-zip \
     poppler-utils \
     re2c && \
   apk add --no-cache \
     --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php8-pecl-xmlrpc && \
+    php81-pecl-xmlrpc && \
   echo "**** download piwigo ****" && \
   if [ -z ${PIWIGO_RELEASE+x} ]; then \
     PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
@@ -46,9 +48,9 @@ RUN \
   unzip -q /tmp/piwigo.zip -d /tmp && \
   mv /tmp/piwigo/* /app/www/public && \
   # The max filesize is 2M by default, which is way to small for most photos
-  sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php8/php.ini && \
+  sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php81/php.ini && \
   # The max post size is 8M by default, it must be at least max_filesize
-  sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php8/php.ini && \
+  sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php81/php.ini && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -15,25 +17,25 @@ RUN \
     imagemagick \
     libjpeg-turbo-utils \
     mediainfo \
-    php8-apcu \
-    php8-cgi \
-    php8-ctype \
-    php8-curl \
-    php8-dom \
-    php8-exif \
-    php8-gd \
-    php8-ldap \
-    php8-mysqli \
-    php8-mysqlnd \
-    php8-pear \
-    php8-pecl-imagick \
-    php8-xsl \
-    php8-zip \
+    php81-apcu \
+    php81-cgi \
+    php81-ctype \
+    php81-curl \
+    php81-dom \
+    php81-exif \
+    php81-gd \
+    php81-ldap \
+    php81-mysqli \
+    php81-mysqlnd \
+    php81-pear \
+    php81-pecl-imagick \
+    php81-xsl \
+    php81-zip \
     poppler-utils \
     re2c && \
   apk add --no-cache \
     --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php8-pecl-xmlrpc && \
+    php81-pecl-xmlrpc && \
   echo "**** download piwigo ****" && \
   if [ -z ${PIWIGO_RELEASE+x} ]; then \
     PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
@@ -46,9 +48,9 @@ RUN \
   unzip -q /tmp/piwigo.zip -d /tmp && \
   mv /tmp/piwigo/* /app/www/public && \
   # The max filesize is 2M by default, which is way to small for most photos
-  sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php8/php.ini && \
+  sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php81/php.ini && \
   # The max post size is 8M by default, it must be at least max_filesize
-  sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php8/php.ini && \
+  sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php81/php.ini && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -15,25 +17,25 @@ RUN \
     imagemagick \
     libjpeg-turbo-utils \
     mediainfo \
-    php8-apcu \
-    php8-cgi \
-    php8-ctype \
-    php8-curl \
-    php8-dom \
-    php8-exif \
-    php8-gd \
-    php8-ldap \
-    php8-mysqli \
-    php8-mysqlnd \
-    php8-pear \
-    php8-pecl-imagick \
-    php8-xsl \
-    php8-zip \
+    php81-apcu \
+    php81-cgi \
+    php81-ctype \
+    php81-curl \
+    php81-dom \
+    php81-exif \
+    php81-gd \
+    php81-ldap \
+    php81-mysqli \
+    php81-mysqlnd \
+    php81-pear \
+    php81-pecl-imagick \
+    php81-xsl \
+    php81-zip \
     poppler-utils \
     re2c && \
   apk add --no-cache \
     --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    php8-pecl-xmlrpc && \
+    php81-pecl-xmlrpc && \
   echo "**** download piwigo ****" && \
   if [ -z ${PIWIGO_RELEASE+x} ]; then \
     PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
@@ -46,9 +48,9 @@ RUN \
   unzip -q /tmp/piwigo.zip -d /tmp && \
   mv /tmp/piwigo/* /app/www/public && \
   # The max filesize is 2M by default, which is way to small for most photos
-  sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php8/php.ini && \
+  sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php81/php.ini && \
   # The max post size is 8M by default, it must be at least max_filesize
-  sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php8/php.ini && \
+  sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php81/php.ini && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*

README.md

@@ -229,6 +229,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.01.23:** - Rebase to alpine 3.17 with php8.1.
 * **16.01.23:** - Fix broken custom template persistence.
 * **08.11.22:** - Rebase to Alpine 3.16, migrate to s6v3. Move application install to /app/www/public, add migration for existing users. Container updates should now update the application correctly.
 * **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).

readme-vars.yml

@@ -38,6 +38,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
   - { date: "16.01.23:", desc: "Fix broken custom template persistence." }
   - { date: "08.11.22:", desc: "Rebase to Alpine 3.16, migrate to s6v3. Move application install to /app/www/public, add migration for existing users. Container updates should now update the application correctly." }
   - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }

root/etc/s6-overlay/s6-rc.d/init-piwigo-config/run

@@ -73,8 +73,7 @@ if [[ ! -f "/config/www/local/config/config.inc.php" ]]; then
     cp /app/www/public/include/config_default.inc.php /config/www/local/config/config.inc.php
 fi
 
-# permissions
+# permissions
 lsiown -R abc:abc \
     /config \
-    /app \
     /gallery