Skip to content

Commit 89a9728

Browse files
thuesketianon
authored andcommitted
Add PHP 8.4 support
1 parent 980d05f commit 89a9728

23 files changed

+2522
-10
lines changed

Dockerfile.template

+7-6
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,12 @@ RUN set -ex; \
8888
# WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
8989
{{ ) else "" end -}}
9090
# https://pecl.php.net/package/imagick
91-
{{ if true then ( -}}
91+
{{ if env.phpVersion == "8.4" then ( -}}
92+
# RC for PHP 8.4 because of https://github.com/Imagick/imagick/issues/689
93+
pecl install imagick-3.8.0RC2; \
94+
docker-php-ext-enable imagick; \
95+
rm -r /tmp/pear; \
96+
{{ ) else ( -}}
9297
# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones 🤔)
9398
# see also https://github.com/Imagick/imagick/pull/641
9499
# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit
@@ -101,11 +106,7 @@ RUN set -ex; \
101106
grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \
102107
docker-php-ext-install /tmp/imagick-3.7.0; \
103108
rm -rf imagick.tgz /tmp/imagick-3.7.0; \
104-
{{ # TODO when imagick has another release, we should ditch this whole block and just update instead -}}
105-
{{ ) else ( -}}
106-
pecl install imagick-3.7.0; \
107-
docker-php-ext-enable imagick; \
108-
rm -r /tmp/pear; \
109+
{{ # TODO when 3.8.0 is GA, we should ditch this whole block and just update instead -}}
109110
{{ ) end -}}
110111
\
111112
# some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967)

beta/php8.4/apache/Dockerfile

+170
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.4/apache/docker-entrypoint.sh

+99
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)