From 1d0c26d203ec114c6b5b63b6aa54af92f1922400 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Sat, 26 Nov 2022 16:57:31 +0100
Subject: [PATCH 1/2] Update to PHP 8.1

---
 Dockerfile                                    | 58 +++++++++----------
 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/{php8 => php81}/conf.d/opcache.ini    |  0
 .../etc/{php8 => php81}/php-fpm.d/www.conf    |  0
 6 files changed, 36 insertions(+), 36 deletions(-)
 rename rootfs/tpls/etc/{php8 => php81}/conf.d/opcache.ini (100%)
 rename rootfs/tpls/etc/{php8 => php81}/php-fpm.d/www.conf (100%)

diff --git a/Dockerfile b/Dockerfile
index 15fa9ea..61c7241 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,35 +33,34 @@ RUN apk --update --no-cache add \
     openssl \
     openssh-client \
     perl \
-    php8 \
-    php8-cli \
-    php8-ctype \
-    php8-curl \
-    php8-dom \
-    php8-fileinfo \
-    php8-fpm \
-    php8-gd \
-    php8-gmp \
-    php8-json \
-    php8-ldap \
-    php8-mbstring \
-    php8-mysqlnd \
-    php8-opcache \
-    php8-openssl \
-    php8-pdo \
-    php8-pdo_mysql \
-    php8-pecl-mcrypt \
-    php8-pecl-memcached \
-    php8-pear \
-    php8-phar \
-    php8-posix \
-    php8-session \
-    php8-simplexml \
-    php8-snmp \
-    php8-sockets \
-    php8-tokenizer \
-    php8-xml \
-    php8-zip \
+    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 \
     python3 \
     py3-pip \
     rrdtool \
@@ -72,6 +71,7 @@ RUN apk --update --no-cache add \
     tzdata \
     util-linux \
     whois \
+  && ln -s /usr/bin/php81 /usr/bin/php \
   && apk --update --no-cache add -t build-dependencies \
     build-base \
     make \
diff --git a/rootfs/etc/cont-init.d/02-fix-perms.sh b/rootfs/etc/cont-init.d/02-fix-perms.sh
index f6ff9e5..51786fa 100644
--- a/rootfs/etc/cont-init.d/02-fix-perms.sh
+++ b/rootfs/etc/cont-init.d/02-fix-perms.sh
@@ -15,6 +15,6 @@ chown -R librenms:librenms \
   /tpls \
   /var/lib/nginx \
   /var/log/nginx \
-  /var/log/php8 \
+  /var/log/php81 \
   /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 cc0fe32..18402aa 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/php8/php-fpm.d/www.conf >/etc/php8/php-fpm.d/www.conf
+  /tpls/etc/php81/php-fpm.d/www.conf >/etc/php81/php-fpm.d/www.conf
 
 echo "Setting PHP INI configuration..."
-sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php8/php.ini
-sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php8/php.ini
-sed -i "s|;max_input_vars.*|max_input_vars = ${MAX_INPUT_VARS}|g" /etc/php8/php.ini
+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
 
 # OpCache
 echo "Setting OpCache configuration..."
 sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \
-  /tpls/etc/php8/conf.d/opcache.ini >/etc/php8/conf.d/opcache.ini
+  /tpls/etc/php81/conf.d/opcache.ini >/etc/php81/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 29df329..b4ff0f1 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-fpm8 -F
+php-fpm81 -F
 EOL
 chmod +x /etc/services.d/php-fpm/run
 
diff --git a/rootfs/tpls/etc/php8/conf.d/opcache.ini b/rootfs/tpls/etc/php81/conf.d/opcache.ini
similarity index 100%
rename from rootfs/tpls/etc/php8/conf.d/opcache.ini
rename to rootfs/tpls/etc/php81/conf.d/opcache.ini
diff --git a/rootfs/tpls/etc/php8/php-fpm.d/www.conf b/rootfs/tpls/etc/php81/php-fpm.d/www.conf
similarity index 100%
rename from rootfs/tpls/etc/php8/php-fpm.d/www.conf
rename to rootfs/tpls/etc/php81/php-fpm.d/www.conf

From 61507ca225f4a73656ffd7b549175be190f20458 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Sat, 26 Nov 2022 16:57:55 +0100
Subject: [PATCH 2/2] LibreNMS 22.11.0

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 61c7241..fe33607 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-ARG LIBRENMS_VERSION="22.10.0"
+ARG LIBRENMS_VERSION="22.11.0"
 ARG WEATHERMAP_PLUGIN_COMMIT="697ac3cdb517aedc81d3b0b2e9ae5582234dca54"
 ARG ALPINE_VERSION="3.16"