From d749648c40c72680c7aa821dc66f84ea747aa9b3 Mon Sep 17 00:00:00 2001
From: Patrick Weyck <p.weyck@shopware.com>
Date: Fri, 6 Dec 2024 08:40:18 +0100
Subject: [PATCH] feat: add php8.4 images

---
 .github/workflows/build.yml | 1 +
 fpm/Dockerfile              | 3 ++-
 matrix.php                  | 8 +++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df94811..f4ea41c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,6 +69,7 @@ jobs:
           build-args: |
             PHP_PATCH_VERSION=${{ matrix.phpPatch }}
             PHP_DIGEST=${{ matrix.phpPatchDigest }}
+            REDIS_PHP_MODULE=${{ matrix.redisPHPModule }}
           push: true
           provenance: false
 
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 17048c0..59f4076 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -4,13 +4,14 @@ ARG PHP_PATCH_VERSION
 ARG PHP_DIGEST
 
 FROM docker.io/library/php:${PHP_PATCH_VERSION}-fpm-alpine@${PHP_DIGEST}
+ARG REDIS_PHP_MODULE=redis
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
 RUN apk add --no-cache icu-data-full curl jq trurl && \
     apk upgrade --no-cache && \
     chmod +x /usr/local/bin/install-php-extensions && \
-    install-php-extensions bcmath gd intl mysqli pdo_mysql pcntl sockets bz2 gmp soap zip ffi opcache redis-6.0.2 apcu-5.1.24 amqp-2.1.2 zstd-0.13.3  && \
+    install-php-extensions bcmath gd intl mysqli pdo_mysql pcntl sockets bz2 gmp soap zip ffi opcache ${REDIS_PHP_MODULE} apcu-5.1.24 amqp-2.1.2 zstd-0.13.3  && \
     mkdir -p /var/www/html && \
     mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini" && \
     rm -f /usr/local/etc/php-fpm.d/zz-docker.conf && \
diff --git a/matrix.php b/matrix.php
index 858ea7a..db66681 100644
--- a/matrix.php
+++ b/matrix.php
@@ -20,7 +20,7 @@ function get_digest_of_image(string $imageName, string $tag): string {
     return $digest;
 }
 
-$supportedVersions = ['8.1', '8.2', '8.3'];
+$supportedVersions = ['8.1', '8.2', '8.3', '8.4'];
 $disallowedVersions = ['8.2.20', '8.3.8'];
 $rcVersions = [];
 
@@ -144,6 +144,11 @@ function get_digest_of_image(string $imageName, string $tag): string {
         ]);
     }
 
+    $redisModule = 'redis';
+    if (version_compare($patchVersion['version'], '8.4', '<')) {
+        $redisModule = 'redis-6.0.2';
+    }
+
     $data[] = [
         'php' => $supportedVersion,
         'phpPatch' => $patchVersion['version'],
@@ -157,6 +162,7 @@ function get_digest_of_image(string $imageName, string $tag): string {
         'nginx-tags-otel' => implode("\n", $nginxImagesOtel),
         'scan-tag' => $caddyImages[0],
         'scan-to' => 'ghcr.io/shopware/docker-base:'.$supportedVersion,
+        'redisPHPModule' => $redisModule,
     ];
 }