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

Merge pull request #284 from mlocati/swoole-ssl 

Enable SSL for swoole whenever possible
pull/285/head 1.2.1
Michele Locati 2021-01-31 11:07:33 +01:00 committed by GitHub
parent bbeae776fe 44717a317e
commit c64e03faaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
install-php-extensions
View File

@ -852,17 +852,8 @@ buildRequiredPackageLists() {
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libssh2-1-dev" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libssh2-1-dev"
;; ;;
swoole@alpine) swoole@alpine)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs libstdc++" buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent postgresql-libs libstdc++ $buildRequiredPackageLists_libssl"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile curl-dev postgresql-dev linux-headers" buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile curl-dev postgresql-dev linux-headers libressl-dev"
case "$DISTRO_VERSION" in
alpine@3.7 | alpine@3.8)
# I can assure you I tried very hard to enable openssl in these Alpine versions...
;;
*)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent $buildRequiredPackageLists_libssl"
buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libressl-dev"
;;
esac
;; ;;
swoole@debian) swoole@debian)
buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libcurl3-gnutls libpq5" buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libcurl3-gnutls libpq5"
@ -1936,13 +1927,13 @@ installRemoteModule() {
else else
installRemoteModule_sockets=no installRemoteModule_sockets=no
fi fi
installRemoteModule_openssl=yes
case "$DISTRO_VERSION" in case "$DISTRO_VERSION" in
alpine@3.7 | alpine@3.8) alpine@3.7 | alpine@3.8)
# I can assure you I tried very hard to enable openssl in these Alpine versions... if test -n "$installRemoteModule_version" && test $(compareVersions "$installRemoteModule_version" 4.6.0) -lt 0; then
# see https://github.com/swoole/swoole-src/issues/3934
installRemoteModule_openssl=no installRemoteModule_openssl=no
;; fi
*)
installRemoteModule_openssl=yes
;; ;;
esac esac
if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 4.6.1) -ge 0; then if test -z "$installRemoteModule_version" || test $(compareVersions "$installRemoteModule_version" 4.6.1) -ge 0; then