From 4a6d777952d0655aa91c30fd225fe86fb0b0bb52 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 <1paneldev@sina.com> Date: Tue, 8 Apr 2025 15:38:06 +0800 Subject: [PATCH] feat: update php install-ext --- php/5/build/data/install-ext | 20 +++++++++++++--- php/7/build/data/install-ext | 22 ++++++++++++++---- php/8/build/data/install-ext | 45 ++++++++++++++---------------------- 3 files changed, 52 insertions(+), 35 deletions(-) diff --git a/php/5/build/data/install-ext b/php/5/build/data/install-ext index 5f4f138b0..f4a6041ca 100644 --- a/php/5/build/data/install-ext +++ b/php/5/build/data/install-ext @@ -1,6 +1,7 @@ #!/bin/bash export MC="-j$(nproc)" +ERROR_CODE=0 echo echo "============================================" @@ -36,10 +37,12 @@ install_php_extensions() { if is_extension_installed "$extension"; then echo "------ install-php-extensions $extension succeeded ------" - return + return 0 fi echo "------ install-php-extensions $extension failed ------" + ERROR_CODE=1 + return 1 } pecl_install() { @@ -48,9 +51,11 @@ pecl_install() { docker-php-ext-enable $extension if is_extension_installed "$extension"; then echo "------ pecl install $extension succeeded ------" - return + return 0 fi echo "------ pecl install $extension failed ------" + ERROR_CODE=1 + return 1 } docker_php_ext_install() { @@ -62,9 +67,11 @@ docker_php_ext_install() { docker-php-ext-install $extension if is_extension_installed "$check_name"; then echo "------ docker-php-ext-install install $extension succeeded ------" - return + return 0 fi echo "------ docker-php-ext-install install $extension failed------" + ERROR_CODE=1 + return 1 } install_extension_default() { @@ -85,6 +92,7 @@ install_extension_default() { echo "------ install-php-extensions $extension succeeded ------" else echo "------ install-php-extensions $extension failed ------" + ERROR_CODE=1 fi fi fi @@ -96,6 +104,7 @@ install_msg() { echo "------ install $1 succeeded ------" else echo "------ install $1 failed ------" + ERROR_CODE=1 fi } @@ -276,6 +285,11 @@ if [[ $extension == *,* ]]; then done else install_extension $extension + if [ $ERROR_CODE -ne 0 ]; then + exit $ERROR_CODE + fi fi docker-php-source delete + +exit 0 diff --git a/php/7/build/data/install-ext b/php/7/build/data/install-ext index 5f4f138b0..55911035b 100644 --- a/php/7/build/data/install-ext +++ b/php/7/build/data/install-ext @@ -1,6 +1,7 @@ #!/bin/bash export MC="-j$(nproc)" +ERROR_CODE=0 echo echo "============================================" @@ -36,10 +37,12 @@ install_php_extensions() { if is_extension_installed "$extension"; then echo "------ install-php-extensions $extension succeeded ------" - return + return 0 fi echo "------ install-php-extensions $extension failed ------" + ERROR_CODE=1 + return 1 } pecl_install() { @@ -48,9 +51,11 @@ pecl_install() { docker-php-ext-enable $extension if is_extension_installed "$extension"; then echo "------ pecl install $extension succeeded ------" - return + return 0 fi echo "------ pecl install $extension failed ------" + ERROR_CODE=1 + return 1 } docker_php_ext_install() { @@ -62,9 +67,11 @@ docker_php_ext_install() { docker-php-ext-install $extension if is_extension_installed "$check_name"; then echo "------ docker-php-ext-install install $extension succeeded ------" - return + return 0 fi echo "------ docker-php-ext-install install $extension failed------" + ERROR_CODE=1 + return 1 } install_extension_default() { @@ -85,6 +92,7 @@ install_extension_default() { echo "------ install-php-extensions $extension succeeded ------" else echo "------ install-php-extensions $extension failed ------" + ERROR_CODE=1 fi fi fi @@ -96,6 +104,7 @@ install_msg() { echo "------ install $1 succeeded ------" else echo "------ install $1 failed ------" + ERROR_CODE=1 fi } @@ -276,6 +285,11 @@ if [[ $extension == *,* ]]; then done else install_extension $extension + if [ $ERROR_CODE -ne 0 ]; then + exit $ERROR_CODE + fi fi -docker-php-source delete +docker-php-source delete + +exit 0 diff --git a/php/8/build/data/install-ext b/php/8/build/data/install-ext index 6d841a395..31213d050 100644 --- a/php/8/build/data/install-ext +++ b/php/8/build/data/install-ext @@ -1,6 +1,7 @@ #!/bin/bash export MC="-j$(nproc)" +ERROR_CODE=0 echo echo "============================================" @@ -40,6 +41,8 @@ install_php_extensions() { fi echo "------ install-php-extensions $extension failed ------" + ERROR_CODE=1 + return 1 } pecl_install() { @@ -48,9 +51,11 @@ pecl_install() { docker-php-ext-enable $extension if is_extension_installed "$extension"; then echo "------ pecl install $extension succeeded ------" - return + return 0 fi echo "------ pecl install $extension failed ------" + ERROR_CODE=1 + return 1 } docker_php_ext_install() { @@ -62,9 +67,11 @@ docker_php_ext_install() { docker-php-ext-install $extension if is_extension_installed "$check_name"; then echo "------ docker-php-ext-install install $extension succeeded ------" - return + return 0 fi echo "------ docker-php-ext-install install $extension failed------" + ERROR_CODE=1 + return 1 } install_extension_default() { @@ -85,42 +92,19 @@ install_extension_default() { echo "------ install-php-extensions $extension succeeded ------" else echo "------ install-php-extensions $extension failed ------" + ERROR_CODE=1 fi fi fi } - -#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 ------" else echo "------ install $1 failed ------" + ERROR_CODE=1 fi } @@ -301,6 +285,11 @@ if [[ $extension == *,* ]]; then done else install_extension $extension + if [ $ERROR_CODE -ne 0 ]; then + exit $ERROR_CODE + fi fi -docker-php-source delete +docker-php-source delete + +exit 0