From 71f150a32240e4e54a6eb9660cabbbe598be4eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arne=20J=C3=B8rgensen?= <arne@arnested.dk>
Date: Sat, 23 Nov 2024 14:13:51 +0100
Subject: [PATCH] Add PHP 8.4 support

---
 Dockerfile | 9 +++++----
 README.md  | 2 +-
 goss.yaml  | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8ff8c54..f40cc11 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,18 +5,19 @@ FROM php:8.0-fpm-alpine@sha256:bbf76d84a693fae1e0d2a259db70c9c47f41bd5a6ec3d339b
 FROM php:8.1-fpm-alpine@sha256:8ac8bf3413dc08471bb8134846018f19ec688c961d2581493bd7fe91cd72b9d2 AS php8.1
 FROM php:8.2-fpm-alpine@sha256:1a6fc2aaa306a3c12264b3d1d6832a598e98f1237090ff853dc6af5db8e5a8f2 AS php8.2
 FROM php:8.3-fpm-alpine@sha256:17fa7702b3d48eb0c064e3410474c81f703b3bcb7a7fe8073503e6c7f157a29a AS php8.3
+FROM php:8.4-fpm-alpine@sha256:79e748df9762464b4fbd27c079150b3fb5535bcdd1550daacf6dfce60fb9fb86 AS php8.4
 
 ## Helper images
 FROM blackfire/blackfire:2@sha256:17d628b0d16b1c297c1a346118d8d134e4f43e0c07658cee1bbb316cf693fc0a AS blackfire
-FROM composer:2@sha256:3e409c6df20d7d8b644f72467d54f203efd6b2695c6345d363abd1ca9a80c4c2 AS composer
-FROM mlocati/php-extension-installer:2@sha256:0b77a6b5d06eda448cd5833ad881208a43a05effd760b4d027ce9ed65f6b6c2f AS php-extension-installer
+FROM composer:2@sha256:26bbf85fccb36247181de6f4a2beddac47d4b352c0c19249a3b4fa2abf1e38ad AS composer
+FROM mlocati/php-extension-installer:2@sha256:4c5935766479484589e6cfab3d69d11ccaf2683ba60ae5202ef3e2e901d537a6 AS php-extension-installer
 
 ## Custom PHP image
 # hadolint ignore=DL3006
 FROM php${php}
 
 ARG php=${php}
-ARG php_enable_extensions="apcu bcmath calendar ctype curl dom exif fileinfo ftp gd gettext iconv imagick/imagick@master intl json mbstring memcache memcached mysqli mysqlnd opcache pdo pdo_mysql pdo_sqlite phar posix readline redis shmop simplexml soap sockets sqlite3 sysvmsg sysvsem sysvshm tokenizer xml xmlreader xmlwriter xsl zip"
+ARG php_enable_extensions="apcu bcmath calendar ctype curl dom exif fileinfo ftp gd gettext iconv imagick intl json mbstring memcache memcached mysqli mysqlnd opcache pdo pdo_mysql pdo_sqlite phar posix readline redis shmop simplexml soap sockets sqlite3 sysvmsg sysvsem sysvshm tokenizer xml xmlreader xmlwriter xsl zip"
 ARG php_install_extensions="blackfire xdebug"
 
 HEALTHCHECK --interval=10s --start-period=90s CMD netstat -ltn | grep -c ":9000"
@@ -29,7 +30,7 @@ RUN <<EOT
     set -eux
     apk add --no-cache bash=~5 git=~2 jq=~1 mariadb-client=~10 msmtp=~1 patch=~2 unzip=~6 graphicsmagick=~1 sudo=~1 tini=~0
     install-php-extensions ${php_enable_extensions}
-    IPE_DONT_ENABLE=1 install-php-extensions ${php_install_extensions}
+    if [ "${php}" != "8.4" ]; then IPE_DONT_ENABLE=1 install-php-extensions ${php_install_extensions}; fi
     adduser -H -D -S -G wheel -u 501 machost
     adduser -H -D -S -G wheel -u 1000 linuxhost
 EOT
diff --git a/README.md b/README.md
index cba9ced..b964faf 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ The images come with the following extensions installed and enabled:
 - zip
 
 In addition, the `xdebug` and `blackfire` extensions are installed but
-not enabled in the images.
+not enabled in the images (except on PHP 8.4).
 
 The
 [php-extension-installer](https://github.com/mlocati/docker-php-extension-installer)
diff --git a/goss.yaml b/goss.yaml
index d698515..73917d8 100644
--- a/goss.yaml
+++ b/goss.yaml
@@ -17,6 +17,7 @@ command:
     stdout:
       - Composer version 2
   install-php-extensions:
+    exec: 'CI=true install-php-extensions'
     exit-status: 0
   php --version:
     exit-status: 0