From 8388b573f6cb6d896f89ecaf04f06b979ebc3a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robson=20Ten=C3=B3rio?= <rrtenorio@gmail.com>
Date: Sat, 23 Nov 2024 16:28:49 +0000
Subject: [PATCH] wip

---
 Dockerfile                                    | 36 +++++++++----------
 config/etc/nginx/sites-available/default      |  2 +-
 .../etc/php/{8.3 => 8.4}/cli/conf.d/y-php.ini |  0
 .../php/{8.3 => 8.4}/fpm/pool.d/y-www.conf    |  2 +-
 .../etc/supervisor/conf.d-temp/php-fpm.conf   |  2 +-
 databases/sqlserver.sh                        |  8 ++---
 6 files changed, 25 insertions(+), 25 deletions(-)
 rename config/etc/php/{8.3 => 8.4}/cli/conf.d/y-php.ini (100%)
 rename config/etc/php/{8.3 => 8.4}/fpm/pool.d/y-www.conf (88%)

diff --git a/Dockerfile b/Dockerfile
index 3bd1ea4..ed72fbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,26 +11,26 @@ ENV CONTAINER_ROLE=${CONTAINER_ROLE:-APP}
 WORKDIR /var/www/app
 
 RUN apt update \
-  # Add PHP 8.3 repository
+  # Add PHP 8.4 repository
   && apt install -y software-properties-common && add-apt-repository ppa:ondrej/php \
   # PHP extensions
   && apt install -y \
-  php8.3-bcmath \
-  php8.3-cli \
-  php8.3-curl \
-  php8.3-fpm \
-  php8.3-gd \
-  php8.3-intl \
-  php8.3-mbstring  \
-  php8.3-mysql \
-  php8.3-redis \
-  php8.3-sockets \
-  php8.3-sqlite3 \
-  php8.3-pcov \
-  php8.3-pgsql \
-  php8.3-opcache \
-  php8.3-xml \
-  php8.3-zip \
+  php8.4-bcmath \
+  php8.4-cli \
+  php8.4-curl \
+  php8.4-fpm \
+  php8.4-gd \
+  php8.4-intl \
+  php8.4-mbstring  \
+  php8.4-mysql \
+  php8.4-redis \
+  php8.4-sockets \
+  php8.4-sqlite3 \
+  php8.4-pcov \
+  php8.4-pgsql \
+  php8.4-opcache \
+  php8.4-xml \
+  php8.4-zip \
   # Extra
   curl \
   git \
@@ -59,7 +59,7 @@ RUN useradd -u 1000 -m -d /home/appuser -g appuser appuser
 # Config files
 COPY --chown=appuser:appuser start.sh /usr/local/bin/start
 COPY --chown=appuser:appuser config/etc /etc
-COPY --chown=appuser:appuser config/etc/php/8.3/cli/conf.d/y-php.ini /etc/php/8.3/fpm/conf.d/y-php.ini
+COPY --chown=appuser:appuser config/etc/php/8.4/cli/conf.d/y-php.ini /etc/php/8.4/fpm/conf.d/y-php.ini
 
 # Permissions for start script
 RUN chmod a+x /usr/local/bin/start
diff --git a/config/etc/nginx/sites-available/default b/config/etc/nginx/sites-available/default
index 0579815..b581a52 100644
--- a/config/etc/nginx/sites-available/default
+++ b/config/etc/nginx/sites-available/default
@@ -26,7 +26,7 @@ server {
 
     # PHP
     location ~ \.php$ {
-        fastcgi_pass unix:/home/appuser/php8.3-fpm.sock;
+        fastcgi_pass unix:/home/appuser/php8.4-fpm.sock;
         fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
         include fastcgi_params;
     }
diff --git a/config/etc/php/8.3/cli/conf.d/y-php.ini b/config/etc/php/8.4/cli/conf.d/y-php.ini
similarity index 100%
rename from config/etc/php/8.3/cli/conf.d/y-php.ini
rename to config/etc/php/8.4/cli/conf.d/y-php.ini
diff --git a/config/etc/php/8.3/fpm/pool.d/y-www.conf b/config/etc/php/8.4/fpm/pool.d/y-www.conf
similarity index 88%
rename from config/etc/php/8.3/fpm/pool.d/y-www.conf
rename to config/etc/php/8.4/fpm/pool.d/y-www.conf
index d7a079e..0c9d8af 100644
--- a/config/etc/php/8.3/fpm/pool.d/y-www.conf
+++ b/config/etc/php/8.4/fpm/pool.d/y-www.conf
@@ -4,7 +4,7 @@ user = appuser
 group = appuser
 listen.owner = appuser
 listen.group = appuser
-listen = /home/appuser/php8.3-fpm.sock
+listen = /home/appuser/php8.4-fpm.sock
 clear_env = no
 
 ; fpm tuning
diff --git a/config/etc/supervisor/conf.d-temp/php-fpm.conf b/config/etc/supervisor/conf.d-temp/php-fpm.conf
index 39ff82c..e22c268 100644
--- a/config/etc/supervisor/conf.d-temp/php-fpm.conf
+++ b/config/etc/supervisor/conf.d-temp/php-fpm.conf
@@ -1,6 +1,6 @@
 # PHP FPM
 [program:php-fpm]
-command=php-fpm8.3 -F
+command=php-fpm8.4 -F
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
diff --git a/databases/sqlserver.sh b/databases/sqlserver.sh
index 5d82673..5130fbc 100644
--- a/databases/sqlserver.sh
+++ b/databases/sqlserver.sh
@@ -5,7 +5,7 @@ set -e
 #   SQLSERVER DRIVERS + TOOLS                    #
 ##################################################
 
-apt install -y php8.3-dev unixodbc-dev
+apt install -y php8.4-dev unixodbc-dev
 
 curl https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc
 curl https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/prod.list | tee /etc/apt/sources.list.d/mssql-release.list
@@ -14,8 +14,8 @@ ACCEPT_EULA=Y apt-get install -y msodbcsql18 mssql-tools18
 
 pecl channel-update pecl.php.net
 pecl install sqlsrv pdo_sqlsrv
-printf "; priority=20\nextension=sqlsrv.so\n" > /etc/php/8.3/mods-available/sqlsrv.ini
-printf "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/8.3/mods-available/pdo_sqlsrv.ini
+printf "; priority=20\nextension=sqlsrv.so\n" > /etc/php/8.4/mods-available/sqlsrv.ini
+printf "; priority=30\nextension=pdo_sqlsrv.so\n" > /etc/php/8.4/mods-available/pdo_sqlsrv.ini
 phpenmod sqlsrv pdo_sqlsrv
 
-apt purge php8.3-dev -y && apt-get autoremove -y
\ No newline at end of file
+apt purge php8.4-dev -y && apt-get autoremove -y
\ No newline at end of file