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

Merge pull request #63 from itscaro/patch-1 

[Debian 9] libssh-dev conflicts with libssl-dev, use libssl1.0-dev instead
pull/68/head
Michele Locati 2019-12-19 16:48:42 +01:00 committed by GitHub
parent 40482177ab f8313949ef
commit f42345f3ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
install-php-extensions
View File

@ -181,9 +181,19 @@ buildRequiredPackageLists () {
buildRequiredPackageLists_volatile='' buildRequiredPackageLists_volatile=''
buildRequiredPackageLists_distro="$(getDistro)" buildRequiredPackageLists_distro="$(getDistro)"
buildRequiredPackageLists_phpv=$1 buildRequiredPackageLists_phpv=$1
if test "$buildRequiredPackageLists_distro" = 'alpine'; then case "$buildRequiredPackageLists_distro" in
buildRequiredPackageLists_volatile="$PHPIZE_DEPS" alpine)
fi buildRequiredPackageLists_volatile="$PHPIZE_DEPS"
;;
debian)
if test -n "$(apt-cache search libssl1.0 | grep -E ^libssl1\.0)"; then
# Debian 9, uses libssl1.0 instead of libssl, due to conflict with libssh-dev
buildRequiredPackageLists_libssldev='libssl1.0-dev'
else
buildRequiredPackageLists_libssldev='libssl-dev'
fi
;;
esac
while :; do while :; do
if test $# -lt 2; then if test $# -lt 2; then
break break
@ -326,7 +336,7 @@ buildRequiredPackageLists () {
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libressl-dev cyrus-sasl-dev" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libressl-dev cyrus-sasl-dev"
;; ;;
mongo@debian) mongo@debian)
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libssl-dev libsasl2-dev" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $buildRequiredPackageLists_libssldev libsasl2-dev"
;; ;;
mongodb@alpine) mongodb@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent icu-libs libsasl snappy" buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent icu-libs libsasl snappy"
@ -339,7 +349,7 @@ buildRequiredPackageLists () {
;; ;;
mongodb@debian) mongodb@debian)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libsnappy1v5" buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libsnappy1v5"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libicu-dev libsasl2-dev libsnappy-dev libssl-dev zlib1g-dev" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libicu-dev libsasl2-dev libsnappy-dev $buildRequiredPackageLists_libssldev zlib1g-dev"
;; ;;
mssql@alpine) mssql@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent freetds" buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent freetds"
@ -522,7 +532,7 @@ buildRequiredPackageLists () {
;; ;;
zip@debian) zip@debian)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libzip4 libmbedtls1?" buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libzip4 libmbedtls1?"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile cmake gnutls-dev libssl-dev libzip-dev libbz2-dev libmbedtls-dev zlib1g-dev" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile cmake gnutls-dev $buildRequiredPackageLists_libssldev libzip-dev libbz2-dev libmbedtls-dev zlib1g-dev"
;; ;;
esac esac
done done
@ -620,6 +630,9 @@ expandPackagesToBeInstalled () {
# $@: the list of APT/APK packages to be installed # $@: the list of APT/APK packages to be installed
installRequiredPackages () { installRequiredPackages () {
printf '### INSTALLING REQUIRED PACKAGES ###\n' printf '### INSTALLING REQUIRED PACKAGES ###\n'
printf '# Packages to be kept after installation: %s\n' "$PACKAGES_PERSISTENT"
printf '# Packages to be used only for installation: %s\n' "$PACKAGES_VOLATILE"
case "$(getDistro)" in case "$(getDistro)" in
alpine) alpine)
apk add $PACKAGES_PERSISTENT $PACKAGES_VOLATILE apk add $PACKAGES_PERSISTENT $PACKAGES_VOLATILE