From 4202f994442d7dc4e45a319dfdd88bad9954d10b Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers <359867+desrosj@users.noreply.github.com> Date: Wed, 4 Dec 2024 13:45:22 -0500 Subject: [PATCH] Try removing pickle. (#159) Co-authored-by: desrosj --- images/8.0/php/Dockerfile | 9 +++------ images/8.1/php/Dockerfile | 9 +++------ images/8.2/php/Dockerfile | 9 +++------ images/8.3/php/Dockerfile | 5 +---- images/8.4/php/Dockerfile | 5 +---- update.php | 11 +---------- 6 files changed, 12 insertions(+), 36 deletions(-) diff --git a/images/8.0/php/Dockerfile b/images/8.0/php/Dockerfile index 4a40a5a..6e12085 100644 --- a/images/8.0/php/Dockerfile +++ b/images/8.0/php/Dockerfile @@ -27,12 +27,9 @@ RUN set -ex; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ - curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \ - chmod +x /usr/local/bin/pickle; \ - \ - pickle install memcached-3.2.0; \ - pickle install xdebug-3.4.0; \ - pickle install imagick; \ + pecl install memcached-3.2.0; \ + pecl install xdebug-3.4.0; \ + pecl install imagick; \ docker-php-ext-enable imagick; \ \ curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \ diff --git a/images/8.1/php/Dockerfile b/images/8.1/php/Dockerfile index ed9b178..eb7bc99 100644 --- a/images/8.1/php/Dockerfile +++ b/images/8.1/php/Dockerfile @@ -27,12 +27,9 @@ RUN set -ex; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ - curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \ - chmod +x /usr/local/bin/pickle; \ - \ - pickle install memcached-3.2.0; \ - pickle install xdebug-3.4.0; \ - pickle install imagick; \ + pecl install memcached-3.2.0; \ + pecl install xdebug-3.4.0; \ + pecl install imagick; \ docker-php-ext-enable imagick; \ \ curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \ diff --git a/images/8.2/php/Dockerfile b/images/8.2/php/Dockerfile index 7928165..f5fbc6b 100644 --- a/images/8.2/php/Dockerfile +++ b/images/8.2/php/Dockerfile @@ -27,12 +27,9 @@ RUN set -ex; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ - curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \ - chmod +x /usr/local/bin/pickle; \ - \ - pickle install memcached-3.2.0; \ - pickle install xdebug-3.4.0; \ - pickle install imagick; \ + pecl install memcached-3.2.0; \ + pecl install xdebug-3.4.0; \ + pecl install imagick; \ docker-php-ext-enable imagick; \ \ curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \ diff --git a/images/8.3/php/Dockerfile b/images/8.3/php/Dockerfile index a1556a3..bc57963 100644 --- a/images/8.3/php/Dockerfile +++ b/images/8.3/php/Dockerfile @@ -27,10 +27,7 @@ RUN set -ex; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ - curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \ - chmod +x /usr/local/bin/pickle; \ - \ - pickle install xdebug-3.4.0; \ + pecl install xdebug-3.4.0; \ \ curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \ curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \ diff --git a/images/8.4/php/Dockerfile b/images/8.4/php/Dockerfile index 2039304..8ce09c3 100644 --- a/images/8.4/php/Dockerfile +++ b/images/8.4/php/Dockerfile @@ -27,10 +27,7 @@ RUN set -ex; \ \ docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \ \ - curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \ - chmod +x /usr/local/bin/pickle; \ - \ - pickle install xdebug-3.4.0; \ + pecl install xdebug-3.4.0; \ \ curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \ curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \ diff --git a/update.php b/update.php index f018dba..9087b7f 100644 --- a/update.php +++ b/update.php @@ -423,21 +423,12 @@ if ( $config['pecl_extensions'] ) { $install_extensions .= " \\\n\t\\\n"; - if ( version_compare( $version, '7.4', '>' ) === true ) { - $install_extensions .= "\tcurl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \\\n"; - $install_extensions .= "\tchmod +x /usr/local/bin/pickle; \\\n\t\\\n"; - } - $install_extensions .= array_reduce( $config['pecl_extensions'], function ( $command, $extension ) use ( $version ) { if ( $command ) { $command .= " \\\n"; } - if ( version_compare( $version, '7.4', '>' ) === true ) { - $command .= "\tpickle install $extension;"; - } else { - $command .= "\tpecl install $extension;"; - } + $command .= "\tpecl install $extension;"; if ( 0 === strpos( $extension, 'imagick' ) ) { $command .= " \\\n\tdocker-php-ext-enable imagick;";