From 528fc32c48133384dbc24eddad8be0d7481c9646 Mon Sep 17 00:00:00 2001
From: "nebojsa.ilic" <nebojsa.ilic@pimcore.com>
Date: Fri, 13 Mar 2026 11:33:32 +0100
Subject: [PATCH 1/4] Pin redis and add ssl

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8c81991..6e7677f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,9 @@ RUN set -eux; \
         libicu-dev \
         libjpeg62-turbo-dev \
         libpng-dev \
+        libssl-dev \
         libzip-dev \
+        openssl \
         zlib1g-dev \
         librabbitmq-dev \
     ; \
@@ -140,7 +142,7 @@ RUN set -eux; \
     pecl install -f \
         apcu \
         imagick \
-        redis \
+        "redis<6.1" \
     ; \
     docker-php-ext-enable \
         apcu \

From ae1e47c36d6bce105bc3f5535c30779c76430797 Mon Sep 17 00:00:00 2001
From: "nebojsa.ilic" <nebojsa.ilic@pimcore.com>
Date: Fri, 13 Mar 2026 12:04:19 +0100
Subject: [PATCH 2/4] Update checkout v4

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2f93ada..52dae72 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,7 +19,7 @@ jobs:
                     - { php: '8.5', distro: trixie, composerOptions: '--ignore-platform-reqs' }
 
         steps:
-            -   uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
             -   name: Build Image
                 run: |
                     set -ex

From 4221ad48494559a0694c7f46b6a530734459025e Mon Sep 17 00:00:00 2001
From: "nebojsa.ilic" <nebojsa.ilic@pimcore.com>
Date: Fri, 13 Mar 2026 12:10:36 +0100
Subject: [PATCH 3/4] Remove PHP8.3 from v5 test and pinned skeleton to 2026.x

---
 .github/workflows/test.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 52dae72..5f86958 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,6 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php: '8.3', distro: bookworm }
                     - { php: '8.4', distro: bookworm }
                     - { php: '8.5', distro: trixie, composerOptions: '--ignore-platform-reqs' }
 
@@ -51,7 +50,7 @@ jobs:
                             docker run --rm pimcore-image test ! -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
                         fi
 
-                        docker run --rm pimcore-image composer create-project pimcore/skeleton:2025.x-dev pimcore --no-scripts ${{ matrix.composerOptions }}
+                        docker run --rm pimcore-image composer create-project pimcore/skeleton:2026.x-dev pimcore --no-scripts ${{ matrix.composerOptions }}
 
                         if [ "$imageVariant" != "min" ]; then
                             docker run -v "$(pwd)/.github/files":/var/www/html --rm pimcore-image php test_heif.php

From d471b52cb3e71474485d5c84e128d6fe1c7cad60 Mon Sep 17 00:00:00 2001
From: Shonster88 <bluvulture@gmail.com>
Date: Fri, 13 Mar 2026 12:29:14 +0100
Subject: [PATCH 4/4] Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6e7677f..94614e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,6 +2,7 @@
 
 ARG PHP_VERSION="8.5"
 ARG DEBIAN_VERSION="trixie"
+ARG REDIS_PECL_VERSION="6.0.2"
 
 FROM php:${PHP_VERSION}-fpm-${DEBIAN_VERSION} AS pimcore_php_min
 
@@ -100,6 +101,7 @@ CMD ["php-fpm"]
 FROM pimcore_php_min AS pimcore_php_default
 
 ARG DEBIAN_VERSION
+ARG REDIS_PECL_VERSION
 
 RUN set -eux; \
     \
@@ -142,7 +144,7 @@ RUN set -eux; \
     pecl install -f \
         apcu \
         imagick \
-        "redis<6.1" \
+        "redis-${REDIS_PECL_VERSION}" \
     ; \
     docker-php-ext-enable \
         apcu \