Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add php 8.4 and prepare 4.0 Release. #180

Merged
merged 10 commits into from
Jan 28, 2025
Merged

Add php 8.4 and prepare 4.0 Release. #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0d437cc
Add php 8.4 and prepare 4.0 Release.
herbertroth Jan 23, 2025
7b4e7da
Update docker test.
herbertroth Jan 23, 2025
647eb83
Don't use trixie as distro.
herbertroth Jan 23, 2025
33f13cf
Update skeleton to 2025.x for tests.
herbertroth Jan 23, 2025
cc142d8
Update skeleton to 2025.x for tests.
herbertroth Jan 23, 2025
0b47bb4
Update skeleton to 2025.x for tests.
herbertroth Jan 23, 2025
4601cad
Remove IMAP
herbertroth Jan 23, 2025
c147362
Update readme.
herbertroth Jan 23, 2025
d582d91
Apply suggestions from code review
brusch Jan 28, 2025
2d41894
Update release.yml
brusch Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +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.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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: bookworm, imagick_version_from_src: 28f27044e435a2b203e32675e942eb8de620ee58 }
steps:
- uses: actions/checkout@v2
- name: Build Image
Expand Down Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
; \
\
Expand Down
11 changes: 6 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3 | v2024.4 |v2025.x
|-----------------|-----|--|---------|---------|-----|
| v1 | ✅ | ✅ | ✅ | ✅ |❌ |
| v2 | ❌ | ✅ | ✅ | ✅ |❌ |
| v3 | ❌ | ✅* | ✅* | ✅ |✅ |
| v4 | ❌ | ❌ | ❌ | ✅* |✅* |

> *) recommended version

Expand Down
Loading