From e4b678252c79c53828e2cf3e96d0a2d2b1c4b406 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Wed, 5 Mar 2025 16:48:26 +0800 Subject: [PATCH] feat: update php extension install --- php/5/build/data/install-ext | 12 ++++++++---- php/5/data.yml | 4 +--- php/7/build/data/install-ext | 12 ++++++++---- php/8/build/data/install-ext | 12 ++++++++---- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/php/5/build/data/install-ext b/php/5/build/data/install-ext index 34a9a8350..fd5d22b0e 100644 --- a/php/5/build/data/install-ext +++ b/php/5/build/data/install-ext @@ -55,8 +55,12 @@ pecl_install() { docker_php_ext_install() { local extension=$1 + local check_name=$2 + if [ -z "$check_name" ]; then + check_name=$extension + fi docker-php-ext-install $extension - if is_extension_installed "$extension"; then + if is_extension_installed "$check_name"; then echo "------ docker-php-ext-install install $extension succeeded ------" return fi @@ -194,7 +198,7 @@ install_extension() { elif [ "$extension" = "sysvmsg" ]; then docker_php_ext_install sysvmsg elif [ "$extension" = "opcache" ]; then - docker_php_ext_install opcache + docker_php_ext_install opcache "Zend OPcache" elif [ "$extension" = "mysqli" ]; then docker_php_ext_install mysqli elif [ "$extension" = "sysvshm" ]; then @@ -226,7 +230,7 @@ install_extension() { elif [ "$extension" = "curl" ]; then install_php_extensions curl elif [ "$extension" = "sourceguardian" ]; then - install_php_extensions sourceguardian + install_php_extensions sourceguardian "SourceGuardian" elif [ "$extension" = "snmp" ]; then install_php_extensions snmp elif [ "$extension" = "mbstring" ]; then @@ -266,7 +270,7 @@ install_extension() { elif [ "$extension" = "zookeeper" ]; then install_php_extensions zookeeper elif [ "$extension" = "ioncube_loader" ]; then - install_php_extensions ioncube_loader + install_php_extensions ioncube_loader "ionCube Loader" elif [ "$extension" = "pdo_sqlsrv" ]; then install_php_extensions pdo_sqlsrv elif [ "$extension" = "sqlsrv" ]; then diff --git a/php/5/data.yml b/php/5/data.yml index 5400804a3..8a8d66866 100755 --- a/php/5/data.yml +++ b/php/5/data.yml @@ -63,10 +63,8 @@ additionalProperties: value: ioncube_loader - label: curl value: curl - - label: sg15 - value: sourceguardian - label: sg11 - value: sourceguardian + value: sg11 - label: imagick value: imagick envKey: PHP_EXTENSIONS diff --git a/php/7/build/data/install-ext b/php/7/build/data/install-ext index 327a4debd..f74bab8fb 100644 --- a/php/7/build/data/install-ext +++ b/php/7/build/data/install-ext @@ -55,8 +55,12 @@ pecl_install() { docker_php_ext_install() { local extension=$1 + local check_name=$2 + if [ -z "$check_name" ]; then + check_name=$extension + fi docker-php-ext-install $extension - if is_extension_installed "$extension"; then + if is_extension_installed "$check_name"; then echo "------ docker-php-ext-install install $extension succeeded ------" return fi @@ -169,7 +173,7 @@ install_extension() { elif [ "$extension" = "sysvmsg" ]; then docker_php_ext_install sysvmsg elif [ "$extension" = "opcache" ]; then - docker_php_ext_install opcache + docker_php_ext_install opcache "Zend OPcache" elif [ "$extension" = "mysqli" ]; then install_php_extensions mysqli elif [ "$extension" = "sysvshm" ]; then @@ -199,7 +203,7 @@ install_extension() { elif [ "$extension" = "curl" ]; then install_php_extensions curl elif [ "$extension" = "sg11" ]; then - install_php_extensions sourceguardian + install_php_extensions sourceguardian "SourceGuardian" elif [ "$extension" = "snmp" ]; then install_php_extensions snmp elif [ "$extension" = "mbstring" ]; then @@ -239,7 +243,7 @@ install_extension() { elif [ "$extension" = "zookeeper" ]; then install_php_extensions zookeeper elif [ "$extension" = "ionCube" ]; then - install_php_extensions ioncube_loader + install_php_extensions ioncube_loader "ionCube Loader" elif [ "$extension" = "pdo_sqlsrv" ]; then install_php_extensions pdo_sqlsrv elif [ "$extension" = "sqlsrv" ]; then diff --git a/php/8/build/data/install-ext b/php/8/build/data/install-ext index 3b307ceb2..555d146f5 100644 --- a/php/8/build/data/install-ext +++ b/php/8/build/data/install-ext @@ -55,8 +55,12 @@ pecl_install() { docker_php_ext_install() { local extension=$1 + local check_name=$2 + if [ -z "$check_name" ]; then + check_name=$extension + fi docker-php-ext-install $extension - if is_extension_installed "$extension"; then + if is_extension_installed "$check_name"; then echo "------ docker-php-ext-install install $extension succeeded ------" return fi @@ -194,7 +198,7 @@ install_extension() { elif [ "$extension" = "sysvmsg" ]; then docker_php_ext_install sysvmsg elif [ "$extension" = "opcache" ]; then - docker_php_ext_install opcache + docker_php_ext_install opcache "Zend OPcache" elif [ "$extension" = "mysqli" ]; then docker_php_ext_install mysqli elif [ "$extension" = "sysvshm" ]; then @@ -224,7 +228,7 @@ install_extension() { elif [ "$extension" = "curl" ]; then install_php_extensions curl elif [ "$extension" = "sg11" ]; then - install_php_extensions sourceguardian + install_php_extensions sourceguardian "SourceGuardian" elif [ "$extension" = "snmp" ]; then install_php_extensions snmp elif [ "$extension" = "mbstring" ]; then @@ -264,7 +268,7 @@ install_extension() { elif [ "$extension" = "zookeeper" ]; then install_php_extensions zookeeper elif [ "$extension" = "ionCube" ]; then - install_php_extensions ioncube_loader + install_php_extensions ioncube_loader "ionCube Loader" elif [ "$extension" = "pdo_sqlsrv" ]; then install_php_extensions pdo_sqlsrv elif [ "$extension" = "sqlsrv" ]; then