From 4cec4761ef99b4cd5faad914b0000bd2dda65257 Mon Sep 17 00:00:00 2001
From: El RIDO <elrido@gmx.net>
Date: Sat, 1 Feb 2025 12:02:25 +0100
Subject: [PATCH] upgrade to PHP 8.4 packages

composer related packages need to stay at PHP 8.3 until the composer package gets upgrade in Alpine - they get removed again at the end of the image build
---
 Dockerfile                                   | 20 ++++++++++++--------
 buildx.sh                                    |  6 +++---
 etc/s6/services/{php-fpm83 => php-fpm84}/run |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)
 rename etc/s6/services/{php-fpm83 => php-fpm84}/run (50%)

diff --git a/Dockerfile b/Dockerfile
index 7955a20..49d85c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.21
 
-ARG ALPINE_PACKAGES="php83-iconv php83-pdo_mysql php83-pdo_pgsql php83-openssl php83-simplexml"
+ARG ALPINE_PACKAGES="php84-iconv php84-pdo_mysql php84-pdo_pgsql php84-openssl php84-simplexml"
 ARG COMPOSER_PACKAGES="aws/aws-sdk-php google/cloud-storage"
 ARG PBURL=https://github.com/PrivateBin/PrivateBin/
 ARG RELEASE=1.7.6
@@ -24,6 +24,7 @@ RUN \
     ALPINE_PACKAGES="$(echo ${ALPINE_PACKAGES} | sed 's/,/ /g')" ;\
     ALPINE_COMPOSER_PACKAGES="" ;\
     if [ -n "${COMPOSER_PACKAGES}" ] ; then \
+        # we need these PHP 8.3 packages until composer gets updated to depend on PHP 8.4
         ALPINE_COMPOSER_PACKAGES="composer" ;\
         if [ -n "${ALPINE_PACKAGES##*php83-curl*}" ] ; then \
             ALPINE_COMPOSER_PACKAGES="php83-curl ${ALPINE_COMPOSER_PACKAGES}" ;\
@@ -31,15 +32,18 @@ RUN \
         if [ -n "${ALPINE_PACKAGES##*php83-mbstring*}" ] ; then \
             ALPINE_COMPOSER_PACKAGES="php83-mbstring ${ALPINE_COMPOSER_PACKAGES}" ;\
         fi ;\
+        if [ -z "${ALPINE_PACKAGES##*php84-simplexml*}" ] ; then \
+            ALPINE_COMPOSER_PACKAGES="php83-simplexml ${ALPINE_COMPOSER_PACKAGES}" ;\
+        fi ;\
     fi \
 # Install dependencies
     && apk upgrade --no-cache \
-    && apk add --no-cache gnupg git nginx php83 php83-ctype php83-fpm php83-gd \
-        php83-opcache s6 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
+    && apk add --no-cache gnupg git nginx php84 php84-ctype php84-fpm php84-gd \
+        php84-opcache s6 tzdata ${ALPINE_PACKAGES} ${ALPINE_COMPOSER_PACKAGES} \
 # Stabilize php config location
-    && mv /etc/php83 /etc/php \
-    && ln -s /etc/php /etc/php83 \
-    && ln -s $(which php83) /usr/local/bin/php \
+    && mv /etc/php84 /etc/php \
+    && ln -s /etc/php /etc/php84 \
+    && ln -s $(which php84) /usr/local/bin/php \
 # Remove (some of the) default nginx & php config
     && rm -f /etc/nginx.conf /etc/nginx/http.d/default.conf /etc/php/php-fpm.d/www.conf \
     && rm -rf /etc/nginx/sites-* \
@@ -75,10 +79,10 @@ RUN \
     && mkdir -p /srv/data \
     && sed -i "s#define('PATH', '');#define('PATH', '/srv/');#" index.php \
 # Support running s6 under a non-root user
-    && mkdir -p /etc/s6/services/nginx/supervise /etc/s6/services/php-fpm83/supervise \
+    && mkdir -p /etc/s6/services/nginx/supervise /etc/s6/services/php-fpm84/supervise \
     && mkfifo \
         /etc/s6/services/nginx/supervise/control \
-        /etc/s6/services/php-fpm83/supervise/control \
+        /etc/s6/services/php-fpm84/supervise/control \
     && chown -R ${UID}:${GID} /etc/s6 /run /srv/* /var/lib/nginx /var/www \
     && chmod o+rwx /run /var/lib/nginx /var/lib/nginx/tmp \
 # Clean up
diff --git a/buildx.sh b/buildx.sh
index 3aeff1a..a624cf4 100755
--- a/buildx.sh
+++ b/buildx.sh
@@ -52,13 +52,13 @@ main() {
             BUILD_ARGS="--build-arg ALPINE_PACKAGES= --build-arg COMPOSER_PACKAGES="
             ;;
         gcs)
-            BUILD_ARGS="--build-arg ALPINE_PACKAGES=php83-openssl --build-arg COMPOSER_PACKAGES=google/cloud-storage"
+            BUILD_ARGS="--build-arg ALPINE_PACKAGES=php84-openssl --build-arg COMPOSER_PACKAGES=google/cloud-storage"
             ;;
         pdo)
-            BUILD_ARGS="--build-arg ALPINE_PACKAGES=php83-pdo_mysql,php83-pdo_pgsql --build-arg COMPOSER_PACKAGES="
+            BUILD_ARGS="--build-arg ALPINE_PACKAGES=php84-pdo_mysql,php84-pdo_pgsql --build-arg COMPOSER_PACKAGES="
             ;;
         s3)
-            BUILD_ARGS="--build-arg ALPINE_PACKAGES=php83-curl,php83-mbstring,php83-openssl,php83-simplexml --build-arg COMPOSER_PACKAGES=aws/aws-sdk-php"
+            BUILD_ARGS="--build-arg ALPINE_PACKAGES=php84-curl,php84-mbstring,php84-openssl,php84-simplexml --build-arg COMPOSER_PACKAGES=aws/aws-sdk-php"
             ;;
         *)
             BUILD_ARGS=""
diff --git a/etc/s6/services/php-fpm83/run b/etc/s6/services/php-fpm84/run
similarity index 50%
rename from etc/s6/services/php-fpm83/run
rename to etc/s6/services/php-fpm84/run
index 54f77bf..c291677 100755
--- a/etc/s6/services/php-fpm83/run
+++ b/etc/s6/services/php-fpm84/run
@@ -1,2 +1,2 @@
 #!/bin/execlineb -P
-/usr/sbin/php-fpm83
+/usr/sbin/php-fpm84