From 39ecf260e1536a6301cb098187c1ba88d4c3718d Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Fri, 13 Mar 2026 11:57:41 +0100 Subject: [PATCH 1/5] Pin redis and add ssl --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2b21937..00df43c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,9 @@ RUN set -eux; \ libicu-dev \ libjpeg62-turbo-dev \ libpng-dev \ + libssl-dev \ libzip-dev \ + openssl \ zlib1g-dev \ librabbitmq-dev \ ; \ @@ -143,7 +145,7 @@ RUN set -eux; \ pecl install -f \ apcu \ imagick \ - redis \ + "redis<6.1" \ ; \ docker-php-ext-enable \ apcu \ From 0b695c016b2d42932da3ea298c3cd798d785acd3 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Fri, 13 Mar 2026 12:03:37 +0100 Subject: [PATCH 2/5] 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 f36001d..77591d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: - { php: '8.3', distro: bookworm } - { php: '8.4', distro: bookworm } steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build Image run: | set -ex From 96741910e3c9bab75871a5ee65d0c45034b81dcf Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Fri, 13 Mar 2026 12:06:17 +0100 Subject: [PATCH 3/5] Update skeleton 2025.4 --- .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 77591d4..df373a8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,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 + docker run --rm pimcore-image composer create-project pimcore/skeleton:2025.4.0 pimcore --no-scripts if [ "$imageVariant" != "min" ]; then docker run -v "$(pwd)/.github/files":/var/www/html --rm pimcore-image php test_heif.php From 70711ff952b43fbd861ad086b9d7463eb66c6fc8 Mon Sep 17 00:00:00 2001 From: Shonster88 Date: Fri, 13 Mar 2026 12:29:37 +0100 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 00df43c..746cc02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ ARG PHP_VERSION="8.4" ARG DEBIAN_VERSION="bookworm" +ARG REDIS_EXT_VERSION="6.0.0" FROM php:${PHP_VERSION}-fpm-${DEBIAN_VERSION} AS pimcore_php_min @@ -145,7 +146,7 @@ RUN set -eux; \ pecl install -f \ apcu \ imagick \ - "redis<6.1" \ + redis-${REDIS_EXT_VERSION} \ ; \ docker-php-ext-enable \ apcu \ From baeed911f1bf3aa301934f39f3b7b312afb7e111 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Fri, 13 Mar 2026 12:36:17 +0100 Subject: [PATCH 5/5] Fix redis version --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 746cc02..cd5de94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -102,6 +102,8 @@ CMD ["php-fpm"] FROM pimcore_php_min AS pimcore_php_default +ARG REDIS_EXT_VERSION + RUN set -eux; \ \ build-install.sh; \