From 3008b454a63ae1e89fe3984a6455f731fe5a3b2b Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 29 Dec 2022 07:11:31 +0100
Subject: [PATCH] PHP 8.1

---
 Dockerfile                                    | 38 +++++++++----------
 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-create-services.sh  |  2 +-
 .../etc/{php8 => php81}/conf.d/opcache.ini    |  0
 .../etc/{php8 => php81}/php-fpm.d/www.conf    |  0
 6 files changed, 26 insertions(+), 26 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 c7d3a3d..bf490d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,25 +11,25 @@ RUN apk --update --no-cache add \
     inotify-tools \
     libgd \
     nginx \
-    php8 \
-    php8-cli \
-    php8-ctype \
-    php8-curl \
-    php8-fpm \
-    php8-gd \
-    php8-json \
-    php8-ldap \
-    php8-mbstring \
-    php8-openssl \
-    php8-pdo \
-    php8-pdo_sqlite \
-    php8-pecl-imagick \
-    php8-session \
-    php8-simplexml \
-    php8-sqlite3 \
-    php8-xml \
-    php8-zip \
-    php8-zlib \
+    php81 \
+    php81-cli \
+    php81-ctype \
+    php81-curl \
+    php81-fpm \
+    php81-gd \
+    php81-json \
+    php81-ldap \
+    php81-mbstring \
+    php81-openssl \
+    php81-pdo \
+    php81-pdo_sqlite \
+    php81-pecl-imagick \
+    php81-session \
+    php81-simplexml \
+    php81-sqlite3 \
+    php81-xml \
+    php81-zip \
+    php81-zlib \
     shadow \
     tar \
     tzdata \
diff --git a/rootfs/etc/cont-init.d/02-fix-perms.sh b/rootfs/etc/cont-init.d/02-fix-perms.sh
index 5d2523f..2baad68 100644
--- a/rootfs/etc/cont-init.d/02-fix-perms.sh
+++ b/rootfs/etc/cont-init.d/02-fix-perms.sh
@@ -11,7 +11,7 @@ chown -R dokuwiki. \
   /tpls \
   /var/lib/nginx \
   /var/log/nginx \
-  /var/log/php8 \
+  /var/log/php81 \
   /var/run/nginx \
   /var/run/php-fpm \
   /var/www/bin \
diff --git a/rootfs/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh
index 393097c..662154f 100644
--- a/rootfs/etc/cont-init.d/03-config.sh
+++ b/rootfs/etc/cont-init.d/03-config.sh
@@ -26,17 +26,17 @@ echo "Setting PHP-FPM configuration..."
 sed -e "s/@MEMORY_LIMIT@/$MEMORY_LIMIT/g" \
   -e "s/@UPLOAD_MAX_SIZE@/$UPLOAD_MAX_SIZE/g" \
   -e "s/@CLEAR_ENV@/$CLEAR_ENV/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|auto_prepend_file.*|auto_prepend_file = /var/www/inc/preload.php|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|auto_prepend_file.*|auto_prepend_file = /var/www/inc/preload.php|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-create-services.sh b/rootfs/etc/cont-init.d/04-create-services.sh
index 2779a16..569c71b 100644
--- a/rootfs/etc/cont-init.d/04-create-services.sh
+++ b/rootfs/etc/cont-init.d/04-create-services.sh
@@ -15,7 +15,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