From 560bfd8362d8a21070c7902f70ec0929cf1168d4 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 Date: Mon, 11 Sep 2023 18:10:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20php7=20=E5=AE=89?= =?UTF-8?q?=E8=A3=85=20pdo=5Fsqlsrv=20=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../7.0.33/build/php/extensions/install.sh | 22 ++---------------- .../7.1.33/build/php/extensions/install.sh | 22 ++---------------- .../7.2.34/build/php/extensions/install.sh | 23 +++---------------- .../7.3.33/build/php/extensions/install.sh | 22 ++---------------- .../7.4.33/build/php/extensions/install.sh | 22 ++---------------- 5 files changed, 11 insertions(+), 100 deletions(-) diff --git a/apps/php7/7.0.33/build/php/extensions/install.sh b/apps/php7/7.0.33/build/php/extensions/install.sh index 7e2f5fed..27e6418a 100644 --- a/apps/php7/7.0.33/build/php/extensions/install.sh +++ b/apps/php7/7.0.33/build/php/extensions/install.sh @@ -469,29 +469,11 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install pdo_sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install pdo_sqlsrv - docker-php-ext-enable pdo_sqlsrv - curl -o /tmp/msodbcsql17_amd64.apk https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.5.2.1-1_amd64.apk - apk add --allow-untrusted /tmp/msodbcsql17_amd64.apk - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions pdo_sqlsrv fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install sqlsrv - docker-php-ext-enable sqlsrv - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions sqlsrv fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then diff --git a/apps/php7/7.1.33/build/php/extensions/install.sh b/apps/php7/7.1.33/build/php/extensions/install.sh index 7e2f5fed..27e6418a 100644 --- a/apps/php7/7.1.33/build/php/extensions/install.sh +++ b/apps/php7/7.1.33/build/php/extensions/install.sh @@ -469,29 +469,11 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install pdo_sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install pdo_sqlsrv - docker-php-ext-enable pdo_sqlsrv - curl -o /tmp/msodbcsql17_amd64.apk https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.5.2.1-1_amd64.apk - apk add --allow-untrusted /tmp/msodbcsql17_amd64.apk - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions pdo_sqlsrv fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install sqlsrv - docker-php-ext-enable sqlsrv - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions sqlsrv fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then diff --git a/apps/php7/7.2.34/build/php/extensions/install.sh b/apps/php7/7.2.34/build/php/extensions/install.sh index 1034f812..27e6418a 100644 --- a/apps/php7/7.2.34/build/php/extensions/install.sh +++ b/apps/php7/7.2.34/build/php/extensions/install.sh @@ -90,6 +90,7 @@ if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then fi # end + if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then echo "---------- Install pdo_mysql ----------" docker-php-ext-install ${MC} pdo_mysql @@ -468,29 +469,11 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install pdo_sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install pdo_sqlsrv - docker-php-ext-enable pdo_sqlsrv - curl -o /tmp/msodbcsql17_amd64.apk https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.5.2.1-1_amd64.apk - apk add --allow-untrusted /tmp/msodbcsql17_amd64.apk - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions pdo_sqlsrv fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install sqlsrv - docker-php-ext-enable sqlsrv - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions sqlsrv fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then diff --git a/apps/php7/7.3.33/build/php/extensions/install.sh b/apps/php7/7.3.33/build/php/extensions/install.sh index 7e2f5fed..27e6418a 100644 --- a/apps/php7/7.3.33/build/php/extensions/install.sh +++ b/apps/php7/7.3.33/build/php/extensions/install.sh @@ -469,29 +469,11 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install pdo_sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install pdo_sqlsrv - docker-php-ext-enable pdo_sqlsrv - curl -o /tmp/msodbcsql17_amd64.apk https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.5.2.1-1_amd64.apk - apk add --allow-untrusted /tmp/msodbcsql17_amd64.apk - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions pdo_sqlsrv fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install sqlsrv - docker-php-ext-enable sqlsrv - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions sqlsrv fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then diff --git a/apps/php7/7.4.33/build/php/extensions/install.sh b/apps/php7/7.4.33/build/php/extensions/install.sh index 7e2f5fed..27e6418a 100644 --- a/apps/php7/7.4.33/build/php/extensions/install.sh +++ b/apps/php7/7.4.33/build/php/extensions/install.sh @@ -469,29 +469,11 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install pdo_sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install pdo_sqlsrv - docker-php-ext-enable pdo_sqlsrv - curl -o /tmp/msodbcsql17_amd64.apk https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.5.2.1-1_amd64.apk - apk add --allow-untrusted /tmp/msodbcsql17_amd64.apk - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions pdo_sqlsrv fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - isPhpVersionGreaterOrEqual 7 1 - if [[ "$?" = "1" ]]; then - echo "---------- Install sqlsrv ----------" - apk add --no-cache unixodbc-dev - printf "\n" | pecl install sqlsrv - docker-php-ext-enable sqlsrv - else - echo "pdo_sqlsrv requires PHP >= 7.1.0, installed version is ${PHP_VERSION}" - fi + install-php-extensions sqlsrv fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then