From 0d437cc69404aaf1032609a7a09f3442029b73fe Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Thu, 23 Jan 2025 10:20:50 +0100 Subject: [PATCH 01/10] Add php 8.4 and prepare 4.0 Release. --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89acde3..da46574 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,6 +31,10 @@ jobs: - { tag: 'v3.5', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - { tag: '3.x', php: '8.2', distro: bookworm, version-override: "v3-dev", latest-tag: false } - { tag: '3.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v3-dev", latest-tag: false } + - { tag: '4.0', php: '8.3', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } + - { tag: '4.0', php: '8.4', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } + - { tag: '4.x', php: '8.3', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false } + - { tag: '4.x', php: '8.4', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false } steps: - uses: actions/checkout@v4 From 7b4e7da02ff30eccb9549f6053b3b8aa86636062 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Thu, 23 Jan 2025 10:27:44 +0100 Subject: [PATCH 02/10] Update docker test. --- .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 4f2efe8..d0d855e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,8 +14,8 @@ jobs: strategy: matrix: include: - - { php: '8.2', distro: bookworm } - { php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } + - { php: '8.4', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } steps: - uses: actions/checkout@v2 - name: Build Image From 647eb834d8c7d8fed8c4d47e4da5e762ecd8e15c Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Thu, 23 Jan 2025 10:44:49 +0100 Subject: [PATCH 03/10] Don't use trixie as distro. --- .github/workflows/release.yml | 8 ++++---- .github/workflows/test.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index da46574..bdf8ac6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,10 +31,10 @@ jobs: - { tag: 'v3.5', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - { tag: '3.x', php: '8.2', distro: bookworm, version-override: "v3-dev", latest-tag: false } - { tag: '3.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v3-dev", latest-tag: false } - - { tag: '4.0', php: '8.3', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - - { tag: '4.0', php: '8.4', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - - { tag: '4.x', php: '8.3', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false } - - { tag: '4.x', php: '8.4', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false } + - { tag: '4.0', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } + - { tag: '4.0', php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } + - { tag: '4.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false } + - { tag: '4.x', php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false } steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d0d855e..904c20a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: matrix: include: - { php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } - - { php: '8.4', distro: trixie, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } + - { php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } steps: - uses: actions/checkout@v2 - name: Build Image From 33f13cfafe6c72ffa56411022a3a9ff6c7ce5420 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Thu, 23 Jan 2025 11:26:41 +0100 Subject: [PATCH 04/10] Update skeleton to 2025.x for tests. --- .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 904c20a..d15949c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,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:2024.x-dev pimcore --no-scripts + docker run --rm pimcore-image composer create-project pimcore/skeleton:2025.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 cc142d81ebfb472309f92006a73169187f24f397 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Thu, 23 Jan 2025 15:54:52 +0100 Subject: [PATCH 05/10] Update skeleton to 2025.x for tests. --- Dockerfile | 4 ++-- README.md | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00b44d0..9b6c45d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -ARG PHP_VERSION="8.2" +ARG PHP_VERSION="8.3" ARG DEBIAN_VERSION="bookworm" FROM php:${PHP_VERSION}-fpm-${DEBIAN_VERSION} AS pimcore_php_min @@ -97,7 +97,7 @@ CMD ["php-fpm"] FROM pimcore_php_min AS pimcore_php_default -ARG IMAGICK_VERSION_FROM_SRC=""; +ARG IMAGICK_VERSION_FROM_SRC="28f27044e435a2b203e32675e942eb8de620ee58"; RUN set -eux; \ \ diff --git a/README.md b/README.md index 6620a52..0234ff2 100644 --- a/README.md +++ b/README.md @@ -28,11 +28,12 @@ Additionally we're offering 2 special tag suffixes: We're also offering special tags for specific PHP versions, e.g. `php8.2.5-v2.0`. ### Pimcore version compatibility & recommendations -| Image / Pimcore | v10 | v11 | v2023.0 | -|-----------------|-----|----|--------| -| v1 | ✅ | ✅ | ✅ | -| v2 | ❌ | ✅ | ✅ | -| v3 | ❌ | ✅* | ✅* | +| Image / Pimcore | v10 | v11 | v2023.x |v2024.x |v2025.x +|-----------------|-----|--|---------|--------|------| +| v1 | ✅ | ✅ | ✅ |✅* |✅* | +| v2 | ❌ | ✅ | ✅ |✅* |✅* | +| v3 | ❌ | ✅* | ✅* |✅* |✅* | +| v4 | ❌ | ❌ | ✅* |✅* |✅* | > *) recommended version From 0b47bb431884d88dc44712e38edff46f4d922527 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Thu, 23 Jan 2025 16:07:18 +0100 Subject: [PATCH 06/10] Update skeleton to 2025.x for tests. --- .github/workflows/test.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d15949c..1fc63b6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: matrix: include: - { php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } - - { php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } + #- { php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } steps: - uses: actions/checkout@v2 - name: Build Image diff --git a/Dockerfile b/Dockerfile index 9b6c45d..d8d2db4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -97,7 +97,7 @@ CMD ["php-fpm"] FROM pimcore_php_min AS pimcore_php_default -ARG IMAGICK_VERSION_FROM_SRC="28f27044e435a2b203e32675e942eb8de620ee58"; +ARG IMAGICK_VERSION_FROM_SRC=""; RUN set -eux; \ \ From 4601cadb3165b69b6b17c78dafe44c41711ce1cd Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Thu, 23 Jan 2025 16:22:23 +0100 Subject: [PATCH 07/10] Remove IMAP --- .github/workflows/test.yml | 2 +- Dockerfile | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1fc63b6..d15949c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: matrix: include: - { php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } - #- { php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } + - { php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 } steps: - uses: actions/checkout@v2 - name: Build Image diff --git a/Dockerfile b/Dockerfile index d8d2db4..c040ac1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -188,13 +188,10 @@ RUN set -eux; \ openssl \ ; \ \ - docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \ docker-php-ext-install \ - imap \ soap \ ; \ docker-php-ext-enable \ - imap \ soap \ ; \ \ From c147362866affa7bd9b10dc40b17b6202c72b8e8 Mon Sep 17 00:00:00 2001 From: Herbert Roth Date: Thu, 23 Jan 2025 16:52:18 +0100 Subject: [PATCH 08/10] Update readme. --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0234ff2..dbdf257 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,12 @@ Additionally we're offering 2 special tag suffixes: We're also offering special tags for specific PHP versions, e.g. `php8.2.5-v2.0`. ### Pimcore version compatibility & recommendations -| Image / Pimcore | v10 | v11 | v2023.x |v2024.x |v2025.x -|-----------------|-----|--|---------|--------|------| -| v1 | ✅ | ✅ | ✅ |✅* |✅* | -| v2 | ❌ | ✅ | ✅ |✅* |✅* | -| v3 | ❌ | ✅* | ✅* |✅* |✅* | -| v4 | ❌ | ❌ | ✅* |✅* |✅* | +| Image / Pimcore | v10 | v11 | v2023.3 | v2024.4 |v2025.x +|-----------------|-----|--|---------|---------|-----| +| v1 | ✅ | ✅ | ✅ | ✅ |❌ | +| v2 | ❌ | ✅ | ✅ | ✅ |❌ | +| v3 | ❌ | ✅* | ✅* | ✅ |✅ | +| v4 | ❌ | ❌ | ❌ | ✅* |✅* | > *) recommended version From d582d91391c4372536c16db9aed59ca0318bc65b Mon Sep 17 00:00:00 2001 From: Bernhard Rusch Date: Tue, 28 Jan 2025 11:19:40 +0100 Subject: [PATCH 09/10] Apply suggestions from code review --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bdf8ac6..3caad89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,8 +31,8 @@ jobs: - { tag: 'v3.5', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - { tag: '3.x', php: '8.2', distro: bookworm, version-override: "v3-dev", latest-tag: false } - { tag: '3.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v3-dev", latest-tag: false } - - { tag: '4.0', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - - { tag: '4.0', php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } + - { tag: 'v4.0', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } + - { tag: 'v4.0', php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - { tag: '4.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false } - { tag: '4.x', php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false } From 2d41894d92c6e6c991300b669badd0c09b1eccf3 Mon Sep 17 00:00:00 2001 From: Bernhard Rusch Date: Tue, 28 Jan 2025 11:59:22 +0100 Subject: [PATCH 10/10] Update release.yml --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3caad89..cc157b5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,8 +31,6 @@ jobs: - { tag: 'v3.5', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - { tag: '3.x', php: '8.2', distro: bookworm, version-override: "v3-dev", latest-tag: false } - { tag: '3.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v3-dev", latest-tag: false } - - { tag: 'v4.0', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - - { tag: 'v4.0', php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "", latest-tag: true } - { tag: '4.x', php: '8.3', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false } - { tag: '4.x', php: '8.4', distro: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58, version-override: "v4-dev", latest-tag: false }