Merge branch 'main' into nginx-cleanup

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
 
 ARG BUILD_DATE
 ARG VERSION
@@ -12,27 +12,27 @@ RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     busybox-suid \
-    php82-dom \
-    php82-gd \
-    php82-intl \
-    php82-ldap \
-    php82-opcache \
-    php82-pecl-apcu \
-    php82-pecl-yaml \
-    php82-redis \
-    php82-tokenizer && \
+    php83-dom \
+    php83-gd \
+    php83-intl \
+    php83-ldap \
+    php83-opcache \
+    php83-pecl-apcu \
+    php83-pecl-yaml \
+    php83-redis \
+    php83-tokenizer && \
   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 "**** setup php opcache ****" && \
   { \
     echo 'opcache.memory_consumption=128'; \
     echo 'opcache.interned_strings_buffer=8'; \
     echo 'opcache.max_accelerated_files=4000'; \
     echo 'opcache.revalidate_freq=2'; \
     echo 'opcache.enable_cli=1'; \
-  } > /etc/php82/conf.d/php-opcache.ini && \
+  } > /etc/php83/conf.d/php-opcache.ini && \
   if [ -z ${GRAV_RELEASE+x} ]; then \
     GRAV_RELEASE=$(curl -sX GET "https://api.github.com/repos/getgrav/grav/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \

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
 
 ARG BUILD_DATE
 ARG VERSION
@@ -12,27 +12,27 @@ RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     busybox-suid \
-    php82-dom \
-    php82-gd \
-    php82-intl \
-    php82-ldap \
-    php82-opcache \
-    php82-pecl-apcu \
-    php82-pecl-yaml \
-    php82-redis \
-    php82-tokenizer && \
+    php83-dom \
+    php83-gd \
+    php83-intl \
+    php83-ldap \
+    php83-opcache \
+    php83-pecl-apcu \
+    php83-pecl-yaml \
+    php83-redis \
+    php83-tokenizer && \
   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 "**** setup php opcache ****" && \
   { \
     echo 'opcache.memory_consumption=128'; \
     echo 'opcache.interned_strings_buffer=8'; \
     echo 'opcache.max_accelerated_files=4000'; \
     echo 'opcache.revalidate_freq=2'; \
     echo 'opcache.enable_cli=1'; \
-  } > /etc/php82/conf.d/php-opcache.ini && \
+  } > /etc/php83/conf.d/php-opcache.ini && \
   if [ -z ${GRAV_RELEASE+x} ]; then \
     GRAV_RELEASE=$(curl -sX GET "https://api.github.com/repos/getgrav/grav/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \