Skip to content

Commit 0297817

Browse files
committed
Migrate to pie
1 parent 83a34e0 commit 0297817

31 files changed

Lines changed: 322 additions & 118 deletions

File tree

Dockerfile.template

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,19 @@ RUN set -ex; \
8888
mysqli \
8989
zip \
9090
; \
91+
\
92+
# install pie to install imagick
93+
PIE_WORKING_DIRECTORY="$(mktemp -d)"; export PIE_WORKING_DIRECTORY; \
94+
curl -fsSL -o /usr/local/bin/pie {{ .pie.url | @sh }}; \
95+
echo '{{ .pie.sha256 }} */usr/local/bin/pie' | sha256sum -c; \
96+
chmod +x /usr/local/bin/pie; \
9197
{{ if is_alpine then ( -}}
9298
# WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328
9399
{{ ) else "" end -}}
94-
# https://pecl.php.net/package/imagick
95-
pecl install imagick-3.8.1; \
96-
docker-php-ext-enable imagick; \
97-
rm -r /tmp/pear; \
100+
# https://packagist.org/packages/imagick/imagick
101+
pie install imagick/imagick:3.8.1; \
102+
# remove pie and cleanup cruft
103+
rm -r /usr/local/bin/pie "$PIE_WORKING_DIRECTORY" /root/.composer; \
98104
\
99105
# some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967)
100106
out="$(php -r 'exit(0);')"; \

beta/php8.2/apache/Dockerfile

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.2/fpm-alpine/Dockerfile

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.2/fpm/Dockerfile

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.3/apache/Dockerfile

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.3/fpm-alpine/Dockerfile

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.3/fpm/Dockerfile

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.4/apache/Dockerfile

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.4/fpm-alpine/Dockerfile

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

beta/php8.4/fpm/Dockerfile

Lines changed: 10 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)