From 3946d37c564e86a8dac9985a50beb7e7e841d8b5 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 <1paneldev@sina.com> Date: Tue, 18 Mar 2025 18:53:59 +0800 Subject: [PATCH] feat: change php install extension --- php/5/build/data/install-ext | 49 ++++++++---------------------------- 1 file changed, 10 insertions(+), 39 deletions(-) diff --git a/php/5/build/data/install-ext b/php/5/build/data/install-ext index 00b6c8f43..5f4f138b0 100644 --- a/php/5/build/data/install-ext +++ b/php/5/build/data/install-ext @@ -57,7 +57,7 @@ docker_php_ext_install() { local extension=$1 local check_name=$2 if [ -z "$check_name" ]; then - check_name=$extension + check_name=$extension fi docker-php-ext-install $extension if is_extension_installed "$check_name"; then @@ -91,31 +91,6 @@ install_extension_default() { } - -install_gd() { - isPhpVersionGreaterOrEqual 8 0 - if [ "$?" = "1" ]; then - # "--with-xxx-dir" was removed from php 7.4, - # issue: https://github.com/docker-library/php/issues/912 - options="--with-freetype --with-jpeg --with-webp" - else - options="--with-gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include/" - fi - apt-get install -y \ - libfreetype6 \ - libfreetype6-dev \ - libpng-dev \ - libwebp-dev \ - libjpeg-dev \ - && docker-php-ext-configure gd ${options} \ - && docker-php-ext-install ${MC} gd \ - && apt-get purge -y \ - libfreetype6-dev \ - libpng-dev \ - && apt-get autoremove -y -} - - install_msg() { if [ $? -eq 0 ]; then echo "------ install $1 succeeded ------" @@ -155,11 +130,11 @@ install_extension() { if is_extension_installed "$extension"; then return fi - + echo "------ install extension: $extension ------" if [ "$extension" = "gd" ]; then - install_gd + install_php_extensions gd elif [ "$extension" = "memcache" ]; then install_memcache elif [ "$extension" = "yaf" ]; then @@ -203,13 +178,11 @@ install_extension() { elif [ "$extension" = "opcache" ]; then docker_php_ext_install opcache "Zend OPcache" elif [ "$extension" = "mysqli" ]; then - docker_php_ext_install mysqli + install_php_extensions mysqli elif [ "$extension" = "sysvshm" ]; then docker_php_ext_install sysvshm elif [ "$extension" = "calendar" ]; then - docker_php_ext_install calendar - elif [ "$extension" = "zmq" ]; then - docker_php_ext_install zmq + docker_php_ext_install calendar elif [ "$extension" = "sodium" ]; then apt-get install -y libsodium-dev docker_php_ext_install sodium @@ -232,7 +205,7 @@ install_extension() { install_php_extensions pgsql elif [ "$extension" = "curl" ]; then install_php_extensions curl - elif [ "$extension" = "sourceguardian" ]; then + elif [ "$extension" = "sg11" ]; then install_php_extensions sourceguardian "SourceGuardian" elif [ "$extension" = "snmp" ]; then install_php_extensions snmp @@ -272,7 +245,7 @@ install_extension() { install_php_extensions amqp elif [ "$extension" = "zookeeper" ]; then install_php_extensions zookeeper - elif [ "$extension" = "ioncube_loader" ]; then + elif [ "$extension" = "ionCube" ]; then install_php_extensions ioncube_loader "ionCube Loader" elif [ "$extension" = "pdo_sqlsrv" ]; then install_php_extensions pdo_sqlsrv @@ -284,12 +257,12 @@ install_extension() { install_php_extensions pspell elif [ "$extension" = "bz2" ]; then install_php_extensions bz2 - elif [ "$extension" = "zmq" ]; then - install_php_extensions zmq elif [ "$extension" = "smbclient" ]; then install_php_extensions smbclient elif [ "$extension" = "event" ]; then - install_php_extensions event + install_php_extensions event + elif [ "$extension" = "zmq" ]; then + install_php_extensions zmq else install_extension_default $extension fi @@ -299,11 +272,9 @@ extension=$1 if [[ $extension == *,* ]]; then echo "${extension}" | tr ',' '\n' | while read -r extension; do - apt-get update install_extension $extension done else - apt-get update install_extension $extension fi