Merge branch 'master' into nginx-cleanup

Author: nemchik

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
 
 # set version label
 ARG BUILD_DATE
@@ -17,19 +17,19 @@ RUN \
     fontconfig \
     mariadb-client \
     memcached \
-    php82-dom \
-    php82-gd \
-    php82-ldap \
-    php82-mysqlnd \
-    php82-pdo_mysql \
-    php82-pecl-memcached \
-    php82-tokenizer \
+    php83-dom \
+    php83-gd \
+    php83-ldap \
+    php83-mysqlnd \
+    php83-pdo_mysql \
+    php83-pecl-memcached \
+    php83-tokenizer \
     qt5-qtbase \
     ttf-freefont && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
   echo "**** fetch bookstack ****" && \
   mkdir -p\
     /app/www && \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
 
 # set version label
 ARG BUILD_DATE
@@ -17,19 +17,19 @@ RUN \
     fontconfig \
     mariadb-client \
     memcached \
-    php82-dom \
-    php82-gd \
-    php82-ldap \
-    php82-mysqlnd \
-    php82-pdo_mysql \
-    php82-pecl-memcached \
-    php82-tokenizer \
+    php83-dom \
+    php83-gd \
+    php83-ldap \
+    php83-mysqlnd \
+    php83-pdo_mysql \
+    php83-pecl-memcached \
+    php83-tokenizer \
     qt5-qtbase \
     ttf-freefont && \
   echo "**** configure php-fpm to pass env vars ****" && \
-  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
-  grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
-  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
   echo "**** fetch bookstack ****" && \
   mkdir -p\
     /app/www && \