From 4510001298d096239489e9c69bb66fe026ad45fe Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Tue, 9 Dec 2025 12:15:54 +0100 Subject: [PATCH 01/13] v5: PHP 8.5 Debian Trixie Pimcore v2026.x --- .github/workflows/release.yml | 3 +++ .github/workflows/test.yml | 2 ++ Dockerfile | 12 ++++++++---- README.md | 13 +++++++------ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 08c35e3..0c9db61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,6 +40,9 @@ jobs: - { tag: '3.x', php: '8.3', distro: bookworm, version-override: "v3-dev", latest-tag: false } - { tag: 'v4.0', php: '8.4', distro: bookworm, version-override: "", latest-tag: true } - { tag: '4.x', php: '8.4', distro: bookworm, version-override: "v4-dev", latest-tag: false } + - { tag: 'v5.0', php: '8.5', distro: trixie, version-override: "", latest-tag: false } + - { tag: '5.x', php: '8.5', distro: trixie, version-override: "v5-dev", latest-tag: false } + steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f36001d..370655e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,6 +16,8 @@ jobs: include: - { php: '8.3', distro: bookworm } - { php: '8.4', distro: bookworm } + - { php: '8.5', distro: trixie } + steps: - uses: actions/checkout@v2 - name: Build Image diff --git a/Dockerfile b/Dockerfile index 2b21937..41278b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,18 @@ # syntax=docker/dockerfile:1 -ARG PHP_VERSION="8.4" -ARG DEBIAN_VERSION="bookworm" +ARG PHP_VERSION="8.5" +ARG DEBIAN_VERSION="trixie" FROM php:${PHP_VERSION}-fpm-${DEBIAN_VERSION} AS pimcore_php_min +ARG DEBIAN_VERSION + COPY --chmod=0755 files/build-*.sh /usr/local/bin/ RUN set -eux; \ \ DPKG_ARCH="$(dpkg --print-architecture)"; \ - echo "deb http://deb.debian.org/debian bookworm-backports main" > /etc/apt/sources.list.d/backports.list; \ + echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION}-backports main" > /etc/apt/sources.list.d/backports.list; \ apt-get update; \ apt-get upgrade -y; \ \ @@ -99,12 +101,14 @@ CMD ["php-fpm"] FROM pimcore_php_min AS pimcore_php_default +ARG DEBIAN_VERSION + RUN set -eux; \ \ build-install.sh; \ \ DPKG_ARCH="$(dpkg --print-architecture)"; \ - echo "deb https://www.deb-multimedia.org bookworm main non-free" > /etc/apt/sources.list.d/deb-multimedia.list; \ + echo "deb https://www.deb-multimedia.org ${DEBIAN_VERSION} main non-free" > /etc/apt/sources.list.d/deb-multimedia.list; \ apt-get update -oAcquire::AllowInsecureRepositories=true; \ apt-get install -y --allow-unauthenticated deb-multimedia-keyring; \ apt-get update; \ diff --git a/README.md b/README.md index 74a26f7..0fa442a 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,13 @@ Use either of the following commands: ### Pimcore version compatibility & recommendations -| Image / Pimcore | v10 | v11 | v2023.3 | v2024.4 |v2025.x -|-----------------|-----|-----|---------|---------|------| -| v1 | ✅ | ✅ | ✅ | ✅ | ❌ | -| v2 | ❌ | ✅ | ✅ | ✅ | ❌ | -| v3 | ❌ | ✅* | ✅* | ✅* | ✅ | -| v4 | ❌ | ❌ | ❌ | ❌ | ✅* | +| Image / Pimcore | v10 | v11 | v2023.3 | v2024.4 |v2025.4 | v2026.x | +|-----------------|-----|-----|---------|---------|------| ------| +| v1 | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | +| v2 | ❌ | ✅ | ✅ | ✅ | ❌ | ❌ | +| v3 | ❌ | ✅* | ✅* | ✅* | ✅ | ✅ | +| v4 | ❌ | ❌ | ❌ | ❌ | ✅* | ✅ | +| v5 | ❌ | ❌ | ❌ | ❌ | ✅ | ✅* | > *) recommended version From abe30f54754352f214405236a76b7a9cba826df3 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Tue, 9 Dec 2025 12:28:11 +0100 Subject: [PATCH 02/13] Imagemagic package name --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 41278b2..e3d3a1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -137,8 +137,8 @@ RUN set -eux; \ \ # ImageMagick apt-get install -y \ - imagemagick-7 \ - libmagickwand-7-dev \ + imagemagick \ + libmagickwand-dev \ ; \ \ docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp; \ From 1d7029efd965ef9a31b611540fbeaa56a29ff10b Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Tue, 16 Dec 2025 11:47:21 +0100 Subject: [PATCH 03/13] Imagemagick from distro --- .github/workflows/release.yml | 6 ++---- Dockerfile | 12 ------------ 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0c9db61..1ecfe6c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,10 +40,8 @@ jobs: - { tag: '3.x', php: '8.3', distro: bookworm, version-override: "v3-dev", latest-tag: false } - { tag: 'v4.0', php: '8.4', distro: bookworm, version-override: "", latest-tag: true } - { tag: '4.x', php: '8.4', distro: bookworm, version-override: "v4-dev", latest-tag: false } - - { tag: 'v5.0', php: '8.5', distro: trixie, version-override: "", latest-tag: false } - - { tag: '5.x', php: '8.5', distro: trixie, version-override: "v5-dev", latest-tag: false } - - + # - { tag: 'v5.0', php: '8.5', distro: trixie, version-override: "", latest-tag: false } + # - { tag: '5.x', php: '8.5', distro: trixie, version-override: "v5-dev", latest-tag: false } steps: - uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index e3d3a1b..3c3af0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,9 +96,6 @@ WORKDIR /var/www/html CMD ["php-fpm"] - - - FROM pimcore_php_min AS pimcore_php_default ARG DEBIAN_VERSION @@ -108,9 +105,6 @@ RUN set -eux; \ build-install.sh; \ \ DPKG_ARCH="$(dpkg --print-architecture)"; \ - echo "deb https://www.deb-multimedia.org ${DEBIAN_VERSION} main non-free" > /etc/apt/sources.list.d/deb-multimedia.list; \ - apt-get update -oAcquire::AllowInsecureRepositories=true; \ - apt-get install -y --allow-unauthenticated deb-multimedia-keyring; \ apt-get update; \ \ # tools used by Pimcore @@ -163,9 +157,6 @@ RUN set -eux; \ CMD ["php-fpm"] - - - FROM pimcore_php_default AS pimcore_php_max RUN set -eux; \ @@ -194,9 +185,6 @@ RUN set -eux; \ CMD ["php-fpm"] - - - FROM pimcore_php_default AS pimcore_php_debug RUN set -eux; \ From 99fe609428122a0b978ee5ab5e3ed0013bab19c6 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Tue, 16 Dec 2025 11:53:29 +0100 Subject: [PATCH 04/13] AMQP pecl --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c3af0b..90749ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,12 +46,11 @@ RUN set -eux; \ zip \ ; \ \ - pecl install -f \ - amqp \ - ; \ - docker-php-ext-enable \ - amqp \ - ; \ + # AMQP extension may fail to build on PHP 8.5 due to missing php support + pecl install -f amqp || echo "pecl amqp install failed; skipping amqp extension"; \ + if [ -f "$(php-config --extension-dir)/amqp.so" ]; then \ + docker-php-ext-enable amqp; \ + fi; \ build-cleanup.sh; \ \ ldconfig /usr/local/lib; \ From 5df8ec5f398dfecd4b8034ce04a204510a1e7830 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Tue, 16 Dec 2025 11:59:24 +0100 Subject: [PATCH 05/13] AMQP pecl --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 90749ab..3c3af0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,11 +46,12 @@ RUN set -eux; \ zip \ ; \ \ - # AMQP extension may fail to build on PHP 8.5 due to missing php support - pecl install -f amqp || echo "pecl amqp install failed; skipping amqp extension"; \ - if [ -f "$(php-config --extension-dir)/amqp.so" ]; then \ - docker-php-ext-enable amqp; \ - fi; \ + pecl install -f \ + amqp \ + ; \ + docker-php-ext-enable \ + amqp \ + ; \ build-cleanup.sh; \ \ ldconfig /usr/local/lib; \ From 79ed7fe0305d42b41515b4fac7083ff1d42cbd76 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Mon, 12 Jan 2026 15:55:49 +0100 Subject: [PATCH 06/13] Removed opcache --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c3af0b..eb9ba28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,6 @@ RUN set -eux; \ exif \ gd \ intl \ - opcache \ pcntl \ pdo_mysql \ sockets \ From 3ece9528acdb85080aecf374b1d0ed480a432d1c Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Mon, 12 Jan 2026 16:13:47 +0100 Subject: [PATCH 07/13] Skeleton version PHP8.5 --- .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 370655e..1e4781e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,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.85-dev pimcore --no-scripts if [ "$imageVariant" != "min" ]; then docker run -v "$(pwd)/.github/files":/var/www/html --rm pimcore-image php test_heif.php From ed71dc8994c884b3399ee52a9573e828346ad635 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Mon, 12 Jan 2026 16:29:01 +0100 Subject: [PATCH 08/13] Skeleton version PHP8.5 --- .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 1e4781e..7379139 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,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.85-dev pimcore --no-scripts + docker run --rm pimcore-image composer create-project pimcore/skeleton:dev-2025.85 pimcore --no-scripts if [ "$imageVariant" != "min" ]; then docker run -v "$(pwd)/.github/files":/var/www/html --rm pimcore-image php test_heif.php From 97ce9324da135d520c94d89fc2c21f9cbdc335f7 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Tue, 13 Jan 2026 13:51:47 +0100 Subject: [PATCH 09/13] Build fix - skeleton branch with php8.5 --- .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 7379139..ec90f97 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,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:dev-2025.85 pimcore --no-scripts + docker run --rm pimcore-image composer create-project pimcore/skeleton:2025.85.x-dev pimcore --no-scripts if [ "$imageVariant" != "min" ]; then docker run -v "$(pwd)/.github/files":/var/www/html --rm pimcore-image php test_heif.php From 07e6240e60062d08bd00c6e93e3367caab5c064e Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Tue, 13 Jan 2026 14:16:02 +0100 Subject: [PATCH 10/13] Build fix - ignore platform reqs --- .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 ec90f97..4208a8f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,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.85.x-dev pimcore --no-scripts + docker run --rm pimcore-image composer create-project pimcore/skeleton:2025.85.x-dev pimcore --no-scripts --ignore-platform-reqs if [ "$imageVariant" != "min" ]; then docker run -v "$(pwd)/.github/files":/var/www/html --rm pimcore-image php test_heif.php From 1a3d39df8100ef350e69b34247fde11bbab3fa37 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Tue, 13 Jan 2026 14:29:57 +0100 Subject: [PATCH 11/13] Removed libc-client-dev --- .github/workflows/test.yml | 2 +- Dockerfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4208a8f..d389d61 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,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.85.x-dev pimcore --no-scripts --ignore-platform-reqs + docker run --rm pimcore-image composer create-project pimcore/skeleton:2025.x-dev pimcore --no-scripts --ignore-platform-reqs if [ "$imageVariant" != "min" ]; then docker run -v "$(pwd)/.github/files":/var/www/html --rm pimcore-image php test_heif.php diff --git a/Dockerfile b/Dockerfile index eb9ba28..8c81991 100644 --- a/Dockerfile +++ b/Dockerfile @@ -164,7 +164,6 @@ RUN set -eux; \ \ apt-get install -y \ chromium-sandbox \ - libc-client-dev \ libkrb5-dev \ libreoffice \ libxml2-dev \ From 0540423dd31271a049a74b710f34320997263c7c Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Tue, 13 Jan 2026 15:13:59 +0100 Subject: [PATCH 12/13] Added composer options to matrix --- .github/workflows/release.yml | 2 ++ Dockerfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ecfe6c..7549927 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,6 +40,7 @@ jobs: - { tag: '3.x', php: '8.3', distro: bookworm, version-override: "v3-dev", latest-tag: false } - { tag: 'v4.0', php: '8.4', distro: bookworm, version-override: "", latest-tag: true } - { tag: '4.x', php: '8.4', distro: bookworm, version-override: "v4-dev", latest-tag: false } + - { tag: '5.x', php: '8.5', distro: trixie, version-override: "", latest-tag: false, composer-options: "--ignore-platform-reqs" } # - { tag: 'v5.0', php: '8.5', distro: trixie, version-override: "", latest-tag: false } # - { tag: '5.x', php: '8.5', distro: trixie, version-override: "v5-dev", latest-tag: false } @@ -124,6 +125,7 @@ jobs: --target="pimcore_php_$imageVariant" \ --build-arg PHP_VERSION="${PHP_VERSION}" \ --build-arg DEBIAN_VERSION="${DEBIAN_VERSION}" \ + --build-arg COMPOSER_OPTIONS="${{ matrix.build.composer-options }}" \ ${TAGS} . docker inspect ${IMAGE_NAME}:${TAG} || true; diff --git a/Dockerfile b/Dockerfile index 8c81991..0e808dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,6 +89,8 @@ ENV PHP_FPM_PM_MAX_REQUESTS=10000 ENV COMPOSER_ALLOW_SUPERUSER=1 ENV COMPOSER_MEMORY_LIMIT=-1 +ARG COMPOSER_OPTIONS="" +ENV COMPOSER_OPTIONS=${COMPOSER_OPTIONS} COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer WORKDIR /var/www/html From e382ee455c2e391048f618de4ea1593a6d7b3858 Mon Sep 17 00:00:00 2001 From: "nebojsa.ilic" Date: Wed, 14 Jan 2026 13:11:40 +0100 Subject: [PATCH 13/13] Added composer options to test.yaml matrix --- .github/workflows/release.yml | 3 +-- .github/workflows/test.yml | 4 ++-- Dockerfile | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7549927..e0d2c0e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,7 +40,7 @@ jobs: - { tag: '3.x', php: '8.3', distro: bookworm, version-override: "v3-dev", latest-tag: false } - { tag: 'v4.0', php: '8.4', distro: bookworm, version-override: "", latest-tag: true } - { tag: '4.x', php: '8.4', distro: bookworm, version-override: "v4-dev", latest-tag: false } - - { tag: '5.x', php: '8.5', distro: trixie, version-override: "", latest-tag: false, composer-options: "--ignore-platform-reqs" } + - { tag: '5.x', php: '8.5', distro: trixie, version-override: "", latest-tag: false } # - { tag: 'v5.0', php: '8.5', distro: trixie, version-override: "", latest-tag: false } # - { tag: '5.x', php: '8.5', distro: trixie, version-override: "v5-dev", latest-tag: false } @@ -125,7 +125,6 @@ jobs: --target="pimcore_php_$imageVariant" \ --build-arg PHP_VERSION="${PHP_VERSION}" \ --build-arg DEBIAN_VERSION="${DEBIAN_VERSION}" \ - --build-arg COMPOSER_OPTIONS="${{ matrix.build.composer-options }}" \ ${TAGS} . docker inspect ${IMAGE_NAME}:${TAG} || true; diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d389d61..2f93ada 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: include: - { php: '8.3', distro: bookworm } - { php: '8.4', distro: bookworm } - - { php: '8.5', distro: trixie } + - { php: '8.5', distro: trixie, composerOptions: '--ignore-platform-reqs' } steps: - uses: actions/checkout@v2 @@ -51,7 +51,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 --ignore-platform-reqs + docker run --rm pimcore-image composer create-project pimcore/skeleton:2025.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 diff --git a/Dockerfile b/Dockerfile index 0e808dd..8c81991 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,8 +89,6 @@ ENV PHP_FPM_PM_MAX_REQUESTS=10000 ENV COMPOSER_ALLOW_SUPERUSER=1 ENV COMPOSER_MEMORY_LIMIT=-1 -ARG COMPOSER_OPTIONS="" -ENV COMPOSER_OPTIONS=${COMPOSER_OPTIONS} COPY --from=composer/composer:2-bin /composer /usr/local/bin/composer WORKDIR /var/www/html