danog/docker-php-extension-installer
1
0
Fork 0
mirror of https://github.com/danog/docker-php-extension-installer.git synced 2024-12-03 09:57:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates after new pickle version

Browse Source 
The new pickle version doesn't require the ZIP php extension anymore.
In addition, it can handle versions much better.

Test: swoole, xdebug, xhprof, pdo_sqlsrv, sqlsrv, igbinary, seaslog, zstd
This commit is contained in:
Michele Locati 2021-01-25 18:21:19 +01:00
parent 570ccafc41
commit f518acbe3b
No known key found for this signature in database
GPG Key ID: 98B7CE2E7234E28B
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
install-php-extensions
View File

@ -2138,7 +2138,6 @@ installRemoteModule() {
} }
# Configure the PECL package installed # Configure the PECL package installed
# If we'll use pickle, the zip extension will be added to PHP_MODULES_TO_INSTALL
# #
# Updates: # Updates:
# PHP_MODULES_TO_INSTALL # PHP_MODULES_TO_INSTALL
@ -2161,10 +2160,7 @@ configureInstaller() {
pecl channel-update pecl.php.net || true pecl channel-update pecl.php.net || true
return return
fi fi
if ! stringInList 'zip' "$PHP_PREINSTALLED_MODULES"; then if false && anyStringInList '' "$PHP_MODULES_TO_INSTALL"; then
PHP_MODULES_TO_INSTALL="zip $(removeStringFromList 'zip' "$PHP_MODULES_TO_INSTALL")"
fi
if anyStringInList 'swoole xdebug xhprof pdo_sqlsrv sqlsrv igbinary seaslog zstd' "$PHP_MODULES_TO_INSTALL"; then
USE_PICKLE=2 USE_PICKLE=2
else else
curl -sSLf https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -o /tmp/pickle curl -sSLf https://github.com/FriendsOfPHP/pickle/releases/latest/download/pickle.phar -o /tmp/pickle
@ -2233,7 +2229,7 @@ installPeclPackage() {
else else
installPeclPackage_fullname="$1@$2" installPeclPackage_fullname="$1@$2"
fi fi
MAKE="make -j$(getCompilationProcessorCount $1)" CPPFLAGS="${3:-}" /tmp/pickle install --tmp-dir=/tmp/pickle.tmp --no-interaction --with-configure-options "$CONFIGURE_FILE" -- "$installPeclPackage_fullname" MAKE="make -j$(getCompilationProcessorCount $1)" CPPFLAGS="${3:-}" /tmp/pickle install --tmp-dir=/tmp/pickle.tmp --no-interaction --version-override='' --with-configure-options "$CONFIGURE_FILE" -- "$installPeclPackage_fullname"
fi fi
} }