diff --git a/Dockerfile.template b/Dockerfile.template index 232c84cd56..b71c37e920 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -44,7 +44,8 @@ WORKDIR /var/www/html {{ ) end -}} # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ {{ if is_alpine then ( -}} apk add --no-cache --virtual .build-deps \ @@ -91,10 +92,9 @@ RUN set -ex; \ {{ if is_alpine then ( -}} # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 {{ ) else "" end -}} -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.2/apache/Dockerfile b/beta/php8.2/apache/Dockerfile index 972acd1b38..733773a8f7 100644 --- a/beta/php8.2/apache/Dockerfile +++ b/beta/php8.2/apache/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.2/fpm-alpine/Dockerfile b/beta/php8.2/fpm-alpine/Dockerfile index f26daa257d..b2f51e68c1 100644 --- a/beta/php8.2/fpm-alpine/Dockerfile +++ b/beta/php8.2/fpm-alpine/Dockerfile @@ -18,7 +18,8 @@ RUN set -eux; \ ; # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -47,10 +48,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.2/fpm/Dockerfile b/beta/php8.2/fpm/Dockerfile index 0a577caf90..26cd5f1052 100644 --- a/beta/php8.2/fpm/Dockerfile +++ b/beta/php8.2/fpm/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.3/apache/Dockerfile b/beta/php8.3/apache/Dockerfile index 6238588431..07a1431db7 100644 --- a/beta/php8.3/apache/Dockerfile +++ b/beta/php8.3/apache/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.3/fpm-alpine/Dockerfile b/beta/php8.3/fpm-alpine/Dockerfile index a2b5065a18..db9ee1f880 100644 --- a/beta/php8.3/fpm-alpine/Dockerfile +++ b/beta/php8.3/fpm-alpine/Dockerfile @@ -18,7 +18,8 @@ RUN set -eux; \ ; # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -47,10 +48,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.3/fpm/Dockerfile b/beta/php8.3/fpm/Dockerfile index 993150baf3..c051823eb3 100644 --- a/beta/php8.3/fpm/Dockerfile +++ b/beta/php8.3/fpm/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.4/apache/Dockerfile b/beta/php8.4/apache/Dockerfile index 49e1a1fcb3..1258489e3e 100644 --- a/beta/php8.4/apache/Dockerfile +++ b/beta/php8.4/apache/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.4/fpm-alpine/Dockerfile b/beta/php8.4/fpm-alpine/Dockerfile index a9c153566b..c1f120ac78 100644 --- a/beta/php8.4/fpm-alpine/Dockerfile +++ b/beta/php8.4/fpm-alpine/Dockerfile @@ -18,7 +18,8 @@ RUN set -eux; \ ; # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -47,10 +48,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.4/fpm/Dockerfile b/beta/php8.4/fpm/Dockerfile index 005469df2f..6c2266b947 100644 --- a/beta/php8.4/fpm/Dockerfile +++ b/beta/php8.4/fpm/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.5/apache/Dockerfile b/beta/php8.5/apache/Dockerfile index ca7ec7d303..73f6ef54d9 100644 --- a/beta/php8.5/apache/Dockerfile +++ b/beta/php8.5/apache/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.5/fpm-alpine/Dockerfile b/beta/php8.5/fpm-alpine/Dockerfile index db8b8c0b64..790d6a75bc 100644 --- a/beta/php8.5/fpm-alpine/Dockerfile +++ b/beta/php8.5/fpm-alpine/Dockerfile @@ -18,7 +18,8 @@ RUN set -eux; \ ; # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -47,10 +48,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/beta/php8.5/fpm/Dockerfile b/beta/php8.5/fpm/Dockerfile index 8b31509200..e41abee3cf 100644 --- a/beta/php8.5/fpm/Dockerfile +++ b/beta/php8.5/fpm/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/cli/php8.2/alpine/Dockerfile b/cli/php8.2/alpine/Dockerfile index cda8c98249..f47357fc0e 100644 --- a/cli/php8.2/alpine/Dockerfile +++ b/cli/php8.2/alpine/Dockerfile @@ -19,7 +19,8 @@ RUN set -ex; \ WORKDIR /var/www/html # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -48,10 +49,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/cli/php8.3/alpine/Dockerfile b/cli/php8.3/alpine/Dockerfile index 31fa8dfd09..7091f15d19 100644 --- a/cli/php8.3/alpine/Dockerfile +++ b/cli/php8.3/alpine/Dockerfile @@ -19,7 +19,8 @@ RUN set -ex; \ WORKDIR /var/www/html # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -48,10 +49,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/cli/php8.4/alpine/Dockerfile b/cli/php8.4/alpine/Dockerfile index c7948b406a..b90e25ede6 100644 --- a/cli/php8.4/alpine/Dockerfile +++ b/cli/php8.4/alpine/Dockerfile @@ -19,7 +19,8 @@ RUN set -ex; \ WORKDIR /var/www/html # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -48,10 +49,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/cli/php8.5/alpine/Dockerfile b/cli/php8.5/alpine/Dockerfile index 147f4bd8a5..8f6977253a 100644 --- a/cli/php8.5/alpine/Dockerfile +++ b/cli/php8.5/alpine/Dockerfile @@ -19,7 +19,8 @@ RUN set -ex; \ WORKDIR /var/www/html # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -48,10 +49,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.2/apache/Dockerfile b/latest/php8.2/apache/Dockerfile index 972acd1b38..733773a8f7 100644 --- a/latest/php8.2/apache/Dockerfile +++ b/latest/php8.2/apache/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.2/fpm-alpine/Dockerfile b/latest/php8.2/fpm-alpine/Dockerfile index f26daa257d..b2f51e68c1 100644 --- a/latest/php8.2/fpm-alpine/Dockerfile +++ b/latest/php8.2/fpm-alpine/Dockerfile @@ -18,7 +18,8 @@ RUN set -eux; \ ; # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -47,10 +48,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.2/fpm/Dockerfile b/latest/php8.2/fpm/Dockerfile index 0a577caf90..26cd5f1052 100644 --- a/latest/php8.2/fpm/Dockerfile +++ b/latest/php8.2/fpm/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.3/apache/Dockerfile b/latest/php8.3/apache/Dockerfile index 6238588431..07a1431db7 100644 --- a/latest/php8.3/apache/Dockerfile +++ b/latest/php8.3/apache/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.3/fpm-alpine/Dockerfile b/latest/php8.3/fpm-alpine/Dockerfile index a2b5065a18..db9ee1f880 100644 --- a/latest/php8.3/fpm-alpine/Dockerfile +++ b/latest/php8.3/fpm-alpine/Dockerfile @@ -18,7 +18,8 @@ RUN set -eux; \ ; # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -47,10 +48,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.3/fpm/Dockerfile b/latest/php8.3/fpm/Dockerfile index 993150baf3..c051823eb3 100644 --- a/latest/php8.3/fpm/Dockerfile +++ b/latest/php8.3/fpm/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.4/apache/Dockerfile b/latest/php8.4/apache/Dockerfile index 49e1a1fcb3..1258489e3e 100644 --- a/latest/php8.4/apache/Dockerfile +++ b/latest/php8.4/apache/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.4/fpm-alpine/Dockerfile b/latest/php8.4/fpm-alpine/Dockerfile index a9c153566b..c1f120ac78 100644 --- a/latest/php8.4/fpm-alpine/Dockerfile +++ b/latest/php8.4/fpm-alpine/Dockerfile @@ -18,7 +18,8 @@ RUN set -eux; \ ; # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -47,10 +48,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.4/fpm/Dockerfile b/latest/php8.4/fpm/Dockerfile index 005469df2f..6c2266b947 100644 --- a/latest/php8.4/fpm/Dockerfile +++ b/latest/php8.4/fpm/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.5/apache/Dockerfile b/latest/php8.5/apache/Dockerfile index ca7ec7d303..73f6ef54d9 100644 --- a/latest/php8.5/apache/Dockerfile +++ b/latest/php8.5/apache/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.5/fpm-alpine/Dockerfile b/latest/php8.5/fpm-alpine/Dockerfile index db8b8c0b64..790d6a75bc 100644 --- a/latest/php8.5/fpm-alpine/Dockerfile +++ b/latest/php8.5/fpm-alpine/Dockerfile @@ -18,7 +18,8 @@ RUN set -eux; \ ; # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ apk add --no-cache --virtual .build-deps \ $PHPIZE_DEPS \ @@ -47,10 +48,9 @@ RUN set -ex; \ zip \ ; \ # WARNING: imagick is likely not supported on Alpine: https://github.com/Imagick/imagick/issues/328 -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \ diff --git a/latest/php8.5/fpm/Dockerfile b/latest/php8.5/fpm/Dockerfile index 8b31509200..e41abee3cf 100644 --- a/latest/php8.5/fpm/Dockerfile +++ b/latest/php8.5/fpm/Dockerfile @@ -20,7 +20,8 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* # install the PHP extensions we need (https://make.wordpress.org/hosting/handbook/handbook/server-environment/#php-extensions) -RUN set -ex; \ +RUN --mount=type=bind,from=ghcr.io/php/pie:bin,source=/pie,target=/usr/local/bin/pie \ + set -ex; \ \ savedAptMark="$(apt-mark showmanual)"; \ \ @@ -50,10 +51,9 @@ RUN set -ex; \ mysqli \ zip \ ; \ -# https://pecl.php.net/package/imagick - pecl install imagick-3.8.1; \ +# https://packagist.org/packages/imagick/imagick + pie install imagick/imagick:3.8.1; \ docker-php-ext-enable imagick; \ - rm -r /tmp/pear; \ \ # some misbehaving extensions end up outputting to stdout 🙈 (https://github.com/docker-library/wordpress/issues/669#issuecomment-993945967) out="$(php -r 'exit(0);')"; \