Merge pull request #74 from linuxserver/3.18

Rebase to 3.18

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -17,24 +17,22 @@ RUN \
     imagemagick \
     libjpeg-turbo-utils \
     mediainfo \
-    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 \
+    php82-apcu \
+    php82-cgi \
+    php82-ctype \
+    php82-curl \
+    php82-dom \
+    php82-exif \
+    php82-gd \
+    php82-ldap \
+    php82-mysqli \
+    php82-mysqlnd \
+    php82-pear \
+    php82-pecl-imagick \
+    php82-xsl \
+    php82-zip \
     poppler-utils \
     re2c && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    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" \
@@ -47,9 +45,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/php81/php.ini && \
+  sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php82/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/php81/php.ini && \
+  sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php82/php.ini && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
@@ -17,24 +17,22 @@ RUN \
     imagemagick \
     libjpeg-turbo-utils \
     mediainfo \
-    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 \
+    php82-apcu \
+    php82-cgi \
+    php82-ctype \
+    php82-curl \
+    php82-dom \
+    php82-exif \
+    php82-gd \
+    php82-ldap \
+    php82-mysqli \
+    php82-mysqlnd \
+    php82-pear \
+    php82-pecl-imagick \
+    php82-xsl \
+    php82-zip \
     poppler-utils \
     re2c && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-    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" \
@@ -47,9 +45,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/php81/php.ini && \
+  sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php82/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/php81/php.ini && \
+  sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php82/php.ini && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*

README.md

@@ -59,7 +59,7 @@ The architectures supported by this image are:
 
 ## Application Setup
 
-* You must create a user and database for piwigo to use in a mysql/mariadb server. 
+* You must create a user and database for piwigo to use in a mysql/mariadb server.
 
 * Self-signed keys are generated the first time you run the container and can be found in `/config/keys`, if needed, you can replace them with your own.
 
@@ -294,6 +294,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **12.12.23:** - Rebase to Alpine 3.18.
 * **03.06.23:** - Revert to Alpine 3.17 due to compatibility issues with php 8.2.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.

readme-vars.yml

@@ -29,7 +29,7 @@ param_ports:
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
-  * You must create a user and database for piwigo to use in a mysql/mariadb server. 
+  * You must create a user and database for piwigo to use in a mysql/mariadb server.
 
   * Self-signed keys are generated the first time you run the container and can be found in `/config/keys`, if needed, you can replace them with your own.
 
@@ -37,6 +37,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "12.12.23:", desc: "Rebase to Alpine 3.18." }
   - { date: "03.06.23:", desc: "Revert to Alpine 3.17 due to compatibility issues with php 8.2." }
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }