Skip to content

Commit 509adb5

Browse files
committed
Update imagick package to 3.7.0
Also apply hack patch for preprocessor build failures
1 parent 8b7fb41 commit 509adb5

File tree

22 files changed

+269
-64
lines changed

22 files changed

+269
-64
lines changed

Dockerfile.template

+17-1
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,25 @@ RUN set -ex; \
8585
# WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
8686
{{ ) else "" end -}}
8787
# https://pecl.php.net/package/imagick
88-
pecl install imagick-3.6.0; \
88+
{{ if true then ( -}}
89+
# https://github.com/Imagick/imagick/commit/5ae2ecf20a1157073bad0170106ad0cf74e01cb6 (causes a lot of build failures, but strangely only intermittent ones 🤔)
90+
# see also https://github.com/Imagick/imagick/pull/641
91+
# this is "pecl install imagick-3.7.0", but by hand so we can apply a small hack / part of the above commit
92+
curl -fL -o imagick.tgz 'https://pecl.php.net/get/imagick-3.7.0.tgz'; \
93+
echo '5a364354109029d224bcbb2e82e15b248be9b641227f45e63425c06531792d3e *imagick.tgz' | sha256sum -c -; \
94+
tar --extract --directory /tmp --file imagick.tgz imagick-3.7.0; \
95+
grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php; \
96+
test "$(grep -c '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php)" = '1'; \
97+
sed -i -e 's!^//#endif$!#endif!' /tmp/imagick-3.7.0/Imagick.stub.php; \
98+
grep '^//#endif$' /tmp/imagick-3.7.0/Imagick.stub.php && exit 1 || :; \
99+
docker-php-ext-install /tmp/imagick-3.7.0; \
100+
rm -rf imagick.tgz /tmp/imagick-3.7.0; \
101+
{{ # TODO when imagick has another release, we should ditch this whole block and just update instead -}}
102+
{{ ) else ( -}}
103+
pecl install imagick-3.7.0; \
89104
docker-php-ext-enable imagick; \
90105
rm -r /tmp/pear; \
106+
{{ ) end -}}
91107
\
92108
# some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967)
93109
out="$(php -r 'exit(0);')"; \

beta/php8.1/apache/Dockerfile

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

beta/php8.1/fpm-alpine/Dockerfile

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

beta/php8.1/fpm/Dockerfile

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

beta/php8.2/apache/Dockerfile

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

beta/php8.2/fpm-alpine/Dockerfile

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

beta/php8.2/fpm/Dockerfile

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

beta/php8.3/apache/Dockerfile

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

beta/php8.3/fpm-alpine/Dockerfile

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

beta/php8.3/fpm/Dockerfile

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

cli/php8.1/alpine/Dockerfile

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

cli/php8.2/alpine/Dockerfile

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

cli/php8.3/alpine/Dockerfile

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

latest/php8.1/apache/Dockerfile

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

0 commit comments

Comments
 (0)