Skip to content

Commit d25c9ee

Browse files
desrosjdesrosj
committed
Merge branch 'trunk' into update/memcached
# Conflicts: # images/8.0/php/Dockerfile # images/8.1/php/Dockerfile # images/8.2/php/Dockerfile # images/8.3/php/Dockerfile
2 parents eeb61fb + 4202f99 commit d25c9ee

File tree

6 files changed

+13
-37
lines changed

6 files changed

+13
-37
lines changed

‎images/8.0/php/Dockerfile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ RUN set -ex; \
2727
\
2828
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
2929
\
30-
curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \
31-
chmod +x /usr/local/bin/pickle; \
32-
\
33-
pickle install memcached-3.3.0; \
34-
pickle install xdebug-3.4.0; \
35-
pickle install imagick; \
30+
pecl install memcached-3.3.0; \
31+
pecl install xdebug-3.4.0; \
32+
pecl install imagick; \
3633
docker-php-ext-enable imagick; \
3734
\
3835
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \

‎images/8.1/php/Dockerfile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ RUN set -ex; \
2727
\
2828
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
2929
\
30-
curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \
31-
chmod +x /usr/local/bin/pickle; \
32-
\
33-
pickle install memcached-3.3.0; \
34-
pickle install xdebug-3.4.0; \
35-
pickle install imagick; \
30+
pecl install memcached-3.3.0; \
31+
pecl install xdebug-3.4.0; \
32+
pecl install imagick; \
3633
docker-php-ext-enable imagick; \
3734
\
3835
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \

‎images/8.2/php/Dockerfile‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,9 @@ RUN set -ex; \
2727
\
2828
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
2929
\
30-
curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \
31-
chmod +x /usr/local/bin/pickle; \
32-
\
33-
pickle install memcached-3.3.0; \
34-
pickle install xdebug-3.4.0; \
35-
pickle install imagick; \
30+
pecl install memcached-3.3.0; \
31+
pecl install xdebug-3.4.0; \
32+
pecl install imagick; \
3633
docker-php-ext-enable imagick; \
3734
\
3835
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \

‎images/8.3/php/Dockerfile‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@ RUN set -ex; \
2727
\
2828
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
2929
\
30-
curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \
31-
chmod +x /usr/local/bin/pickle; \
32-
\
33-
pickle install memcached-3.3.0; \
34-
pickle install xdebug-3.4.0; \
30+
pecl install memcached-3.3.0; \
31+
pecl install xdebug-3.4.0; \
3532
\
3633
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
3734
curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \

‎images/8.4/php/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ RUN set -ex; \
2727
\
2828
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
2929
\
30-
curl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \
31-
chmod +x /usr/local/bin/pickle; \
32-
\
33-
pickle install xdebug-3.4.0; \
30+
pecl install xdebug-3.4.0; \
3431
\
3532
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
3633
curl --silent --fail --location --retry 3 --output /tmp/installer.sig --url https://composer.github.io/installer.sig; \

‎update.php‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -423,21 +423,12 @@
423423
if ( $config['pecl_extensions'] ) {
424424
$install_extensions .= " \\\n\t\\\n";
425425

426-
if ( version_compare( $version, '7.4', '>' ) === true ) {
427-
$install_extensions .= "\tcurl --location --output /usr/local/bin/pickle https://github.com/FriendsOfPHP/pickle/releases/download/v0.7.11/pickle.phar; \\\n";
428-
$install_extensions .= "\tchmod +x /usr/local/bin/pickle; \\\n\t\\\n";
429-
}
430-
431426
$install_extensions .= array_reduce( $config['pecl_extensions'], function ( $command, $extension ) use ( $version ) {
432427
if ( $command ) {
433428
$command .= " \\\n";
434429
}
435430

436-
if ( version_compare( $version, '7.4', '>' ) === true ) {
437-
$command .= "\tpickle install $extension;";
438-
} else {
439-
$command .= "\tpecl install $extension;";
440-
}
431+
$command .= "\tpecl install $extension;";
441432

442433
if ( 0 === strpos( $extension, 'imagick' ) ) {
443434
$command .= " \\\n\tdocker-php-ext-enable imagick;";

0 commit comments

Comments
 (0)