diff --git a/8.1.Dockerfile b/8.1.Dockerfile index 57bfa7d..0f3e4e0 100644 --- a/8.1.Dockerfile +++ b/8.1.Dockerfile @@ -16,8 +16,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ -COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +# COPY --from=adhocore/phpfpm:8.1 /usr/local/lib/php/extensions/no-debug-non-zts-20210902/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20210902/ +# COPY --from=adhocore/phpfpm:8.1 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -38,7 +38,7 @@ RUN \ # # php extensions && docker-php-source extract \ - && rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20210902/intl.so /usr/local/etc/php/conf.d/docker-php-ext-intl.ini \ + && docker-php-ext-remove intl \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \ diff --git a/8.2.Dockerfile b/8.2.Dockerfile index 46c4adf..037fc9e 100644 --- a/8.2.Dockerfile +++ b/8.2.Dockerfile @@ -18,8 +18,8 @@ ENV \ COPY docker-* /usr/local/bin/ # copy from existing -# COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ -# COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/lib/php/extensions/no-debug-non-zts-20220829/*.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ +COPY --from=adhocore/phpfpm:8.2 /usr/local/etc/php/conf.d/*.ini /usr/local/etc/php/conf.d/ # ext COPY ext.php /ext.php @@ -40,7 +40,7 @@ RUN \ # # php extensions && docker-php-source extract \ - && echo docker-php-ext-remove apcu intl mognodb imagick \ + && docker-php-ext-remove intl \ && pecl channel-update pecl.php.net \ && { php -m | grep gd || docker-php-ext-configure gd --with-freetype --with-jpeg --enable-gd; } \ && docker-php-ext-install-if $PHP_EXTENSIONS \