Skip to content

Commit a52039a

Browse files
committed
Update to imagick 3.8.0 (now GA)
This fixes the build issue we were working around *and* includes support for PHP 8.4.
1 parent 77245d4 commit a52039a

File tree

29 files changed

+71
-284
lines changed

29 files changed

+71
-284
lines changed

Dockerfile.template

+1-18
Original file line numberDiff line numberDiff line change
@@ -88,26 +88,9 @@ 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 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; \
91+
pecl install imagick-3.8.0; \
9492
docker-php-ext-enable imagick; \
9593
rm -r /tmp/pear; \
96-
{{ ) else ( -}}
97-
# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones 🤔)
98-
# see also https://github.com/Imagick/imagick/pull/641
99-
# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit
100-
curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \
101-
echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \
102-
tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \
103-
grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \
104-
test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \
105-
sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \
106-
grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \
107-
docker-php-ext-install /tmp/imagick-3.7.0; \
108-
rm -rf imagick.tgz /tmp/imagick-3.7.0; \
109-
{{ # TODO when 3.8.0 is GA, we should ditch this whole block and just update instead -}}
110-
{{ ) end -}}
11194
\
11295
# some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967)
11396
out="$(php -r 'exit(0);')"; \

beta/php8.1/apache/Dockerfile

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

beta/php8.1/fpm-alpine/Dockerfile

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

beta/php8.1/fpm/Dockerfile

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

beta/php8.2/apache/Dockerfile

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

beta/php8.2/fpm-alpine/Dockerfile

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

beta/php8.2/fpm/Dockerfile

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

beta/php8.3/apache/Dockerfile

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

beta/php8.3/fpm-alpine/Dockerfile

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

beta/php8.3/fpm/Dockerfile

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

beta/php8.4/apache/Dockerfile

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

beta/php8.4/fpm-alpine/Dockerfile

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

beta/php8.4/fpm/Dockerfile

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

cli/php8.1/alpine/Dockerfile

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

cli/php8.2/alpine/Dockerfile

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

cli/php8.3/alpine/Dockerfile

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

cli/php8.4/alpine/Dockerfile

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

0 commit comments

Comments
 (0)