From fe485f877a01ea6057f0d3e60208786f5793cd07 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Fri, 1 Mar 2024 10:49:13 +0100
Subject: [PATCH] PHP 8.2

---
 Dockerfile                                    | 56 +++++++++----------
 rootfs/etc/cont-init.d/02-fix-perms.sh        |  2 +-
 rootfs/etc/cont-init.d/03-config.sh           | 10 ++--
 rootfs/etc/cont-init.d/04-svc-main.sh         |  2 +-
 .../etc/{php81 => php82}/conf.d/opcache.ini   |  0
 .../etc/{php81 => php82}/php-fpm.d/www.conf   |  0
 6 files changed, 35 insertions(+), 35 deletions(-)
 rename rootfs/tpls/etc/{php81 => php82}/conf.d/opcache.ini (100%)
 rename rootfs/tpls/etc/{php81 => php82}/php-fpm.d/www.conf (100%)

diff --git a/Dockerfile b/Dockerfile
index d4279d6..c0d3784 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,34 +35,34 @@ RUN apk --update --no-cache add \
     openssl \
     openssh-client \
     perl \
-    php81 \
-    php81-cli \
-    php81-ctype \
-    php81-curl \
-    php81-dom \
-    php81-fileinfo \
-    php81-fpm \
-    php81-gd \
-    php81-gmp \
-    php81-json \
-    php81-ldap \
-    php81-mbstring \
-    php81-mysqlnd \
-    php81-opcache \
-    php81-openssl \
-    php81-pdo \
-    php81-pdo_mysql \
-    php81-pecl-memcached \
-    php81-pear \
-    php81-phar \
-    php81-posix \
-    php81-session \
-    php81-simplexml \
-    php81-snmp \
-    php81-sockets \
-    php81-tokenizer \
-    php81-xml \
-    php81-zip \
+    php82 \
+    php82-cli \
+    php82-ctype \
+    php82-curl \
+    php82-dom \
+    php82-fileinfo \
+    php82-fpm \
+    php82-gd \
+    php82-gmp \
+    php82-json \
+    php82-ldap \
+    php82-mbstring \
+    php82-mysqlnd \
+    php82-opcache \
+    php82-openssl \
+    php82-pdo \
+    php82-pdo_mysql \
+    php82-pecl-memcached \
+    php82-pear \
+    php82-phar \
+    php82-posix \
+    php82-session \
+    php82-simplexml \
+    php82-snmp \
+    php82-sockets \
+    php82-tokenizer \
+    php82-xml \
+    php82-zip \
     python3 \
     py3-pip \
     rrdtool \
diff --git a/rootfs/etc/cont-init.d/02-fix-perms.sh b/rootfs/etc/cont-init.d/02-fix-perms.sh
index 3b54519..4f43ab6 100644
--- a/rootfs/etc/cont-init.d/02-fix-perms.sh
+++ b/rootfs/etc/cont-init.d/02-fix-perms.sh
@@ -16,6 +16,6 @@ chown -R librenms:librenms \
   /tpls \
   /var/lib/nginx \
   /var/log/nginx \
-  /var/log/php81 \
+  /var/log/php82 \
   /var/run/nginx \
   /var/run/php-fpm
diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh
index 18402aa..d9b4534 100644
--- a/rootfs/etc/cont-init.d/03-config.sh
+++ b/rootfs/etc/cont-init.d/03-config.sh
@@ -64,17 +64,17 @@ sed -e "s/@MEMORY_LIMIT@/$MEMORY_LIMIT/g" \
   -e "s/@FPM_PM_START_SERVERS@/$FPM_PM_START_SERVERS/g" \
   -e "s/@FPM_PM_MIN_SPARE_SERVERS@/$FPM_PM_MIN_SPARE_SERVERS/g" \
   -e "s/@FPM_PM_MAX_SPARE_SERVERS@/$FPM_PM_MAX_SPARE_SERVERS/g" \
-  /tpls/etc/php81/php-fpm.d/www.conf >/etc/php81/php-fpm.d/www.conf
+  /tpls/etc/php82/php-fpm.d/www.conf >/etc/php82/php-fpm.d/www.conf
 
 echo "Setting PHP INI configuration..."
-sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php81/php.ini
-sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php81/php.ini
-sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php81/php.ini
+sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php82/php.ini
+sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php82/php.ini
+sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php82/php.ini
 
 # OpCache
 echo "Setting OpCache configuration..."
 sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \
-  /tpls/etc/php81/conf.d/opcache.ini >/etc/php81/conf.d/opcache.ini
+  /tpls/etc/php82/conf.d/opcache.ini >/etc/php82/conf.d/opcache.ini
 
 # Nginx
 echo "Setting Nginx configuration..."
diff --git a/rootfs/etc/cont-init.d/04-svc-main.sh b/rootfs/etc/cont-init.d/04-svc-main.sh
index b4ff0f1..f81d824 100644
--- a/rootfs/etc/cont-init.d/04-svc-main.sh
+++ b/rootfs/etc/cont-init.d/04-svc-main.sh
@@ -99,7 +99,7 @@ cat >/etc/services.d/php-fpm/run <<EOL
 #!/usr/bin/execlineb -P
 with-contenv
 s6-setuidgid ${PUID}:${PGID}
-php-fpm81 -F
+php-fpm82 -F
 EOL
 chmod +x /etc/services.d/php-fpm/run
 
diff --git a/rootfs/tpls/etc/php81/conf.d/opcache.ini b/rootfs/tpls/etc/php82/conf.d/opcache.ini
similarity index 100%
rename from rootfs/tpls/etc/php81/conf.d/opcache.ini
rename to rootfs/tpls/etc/php82/conf.d/opcache.ini
diff --git a/rootfs/tpls/etc/php81/php-fpm.d/www.conf b/rootfs/tpls/etc/php82/php-fpm.d/www.conf
similarity index 100%
rename from rootfs/tpls/etc/php81/php-fpm.d/www.conf
rename to rootfs/tpls/etc/php82/php-fpm.d/www.conf