From 4f94c2fe5211e0c0555f481d17f568bda8dc78b9 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 26 Feb 2022 10:08:38 -0500
Subject: [PATCH] Bump to PHP 8.1 as min for v2

---
 build/panel/Dockerfile               | 24 ++++++++++++------------
 build/panel/configs/pterodactyl.conf |  2 +-
 build/panel/configs/supervisord.conf |  2 +-
 build/panel/entrypoint               |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/build/panel/Dockerfile b/build/panel/Dockerfile
index b63799a..44b6dc2 100644
--- a/build/panel/Dockerfile
+++ b/build/panel/Dockerfile
@@ -31,18 +31,18 @@ RUN apt -y update \
         nodejs \
         yarn \
         nano \
-	&& apt -y --no-install-recommends install php8.0 \
-		php8.0-cli \
-		php8.0-common \
-		php8.0-gd \
-		php8.0-mysql \
-		php8.0-mbstring \
-		php8.0-bcmath \
-		php8.0-xml \
-		php8.0-fpm \
-		php8.0-curl \
-		php8.0-zip \
-		php8.0-xdebug \
+	&& apt -y --no-install-recommends install php8.1 \
+		php8.1-cli \
+		php8.1-common \
+		php8.1-gd \
+		php8.1-mysql \
+		php8.1-mbstring \
+		php8.1-bcmath \
+		php8.1-xml \
+		php8.1-fpm \
+		php8.1-curl \
+		php8.1-zip \
+		php8.1-xdebug \
 	&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
 	&& apt autoremove -y \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/build/panel/configs/pterodactyl.conf b/build/panel/configs/pterodactyl.conf
index 0f198fc..51dfcf9 100644
--- a/build/panel/configs/pterodactyl.conf
+++ b/build/panel/configs/pterodactyl.conf
@@ -30,7 +30,7 @@ server {
 
     location ~ \.php$ {
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/var/run/php/php8.0-fpm.sock;
+        fastcgi_pass unix:/var/run/php/php8.1-fpm.sock;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
diff --git a/build/panel/configs/supervisord.conf b/build/panel/configs/supervisord.conf
index 5cdfdc9..5765468 100644
--- a/build/panel/configs/supervisord.conf
+++ b/build/panel/configs/supervisord.conf
@@ -16,7 +16,7 @@ redirect_stderr=true
 stdout_logfile=/var/www/html/storage/logs/supervisor-worker.log
 
 [program:php-fpm]
-command=/usr/sbin/php-fpm8.0 -F
+command=/usr/sbin/php-fpm8.1 -F
 autostart=true
 autorestart=true
 priority=5
diff --git a/build/panel/entrypoint b/build/panel/entrypoint
index 8f09607..d0cef6b 100644
--- a/build/panel/entrypoint
+++ b/build/panel/entrypoint
@@ -2,15 +2,15 @@
 set -x
 if [ -d "/etc/php/mods-available"]; then
   if [ -d "/etc/php/mods-available/cli" ]; then
-    sudo ln -s /etc/php/mods-available/cli/* /etc/php/8.0/cli/conf.d
+    sudo ln -s /etc/php/mods-available/cli/* /etc/php/8.1/cli/conf.d
   fi
   if [ -d "/etc/php/mods-available/fpm" ]; then
-    sudo ln -s /etc/php/mods-available/fpm/* /etc/php/8.0/fpm/conf.d
+    sudo ln -s /etc/php/mods-available/fpm/* /etc/php/8.1/fpm/conf.d
   fi
   find . -maxdepth 1 -type f -print0 | while read -d $'\0' file
   do
-    sudo ln -s "$file" /etc/php/8.0/cli/conf.d/
-    sudo ln -s "$file" /etc/php/8.0/fpm/conf.d/
+    sudo ln -s "$file" /etc/php/8.1/cli/conf.d/
+    sudo ln -s "$file" /etc/php/8.1/fpm/conf.d/
   done
 fi