public-mirrors
/
docker-php-extension-installer
mirror of https://github.com/mlocati/docker-php-extension-installer
1
0
Fork 0
Code

Fix handling of buildRequiredPackageLists output

pull/86/head
Michele Locati 2019-12-23 11:50:42 +01:00
parent bc758dce01
commit 9c33fa11b5
No known key found for this signature in database
GPG Key ID: 98B7CE2E7234E28B
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
install-php-extensions
View File

@ -180,10 +180,6 @@ sortModulesToInstall() {
# Set: # Set:
# PACKAGES_PERSISTENT # PACKAGES_PERSISTENT
# PACKAGES_VOLATILE # PACKAGES_VOLATILE
#
# Return:
# 0 (true): if we to install some package
# 1 (false): if no package is required
buildRequiredPackageLists() { buildRequiredPackageLists() {
buildRequiredPackageLists_persistent='' buildRequiredPackageLists_persistent=''
buildRequiredPackageLists_volatile='' buildRequiredPackageLists_volatile=''
@ -555,7 +551,7 @@ buildRequiredPackageLists() {
PACKAGES_PERSISTENT='' PACKAGES_PERSISTENT=''
PACKAGES_VOLATILE='' PACKAGES_VOLATILE=''
if test -z "$buildRequiredPackageLists_persistent$buildRequiredPackageLists_volatile"; then if test -z "$buildRequiredPackageLists_persistent$buildRequiredPackageLists_volatile"; then
return 0 return
fi fi
case "$buildRequiredPackageLists_distro" in case "$buildRequiredPackageLists_distro" in
alpine) alpine)
@ -1159,7 +1155,8 @@ fi
sortModulesToInstall sortModulesToInstall
if buildRequiredPackageLists $PHP_MAJMIN_VERSION $PHP_MODULES_TO_INSTALL; then buildRequiredPackageLists $PHP_MAJMIN_VERSION $PHP_MODULES_TO_INSTALL
if test -n "$PACKAGES_PERSISTENT$PACKAGES_VOLATILE"; then
installRequiredPackages installRequiredPackages
fi fi
docker-php-source extract docker-php-source extract