diff --git a/apps/node/12.22.12/run.sh b/apps/node/12.22.12/run.sh index 3187406d3..e7228d429 100644 --- a/apps/node/12.22.12/run.sh +++ b/apps/node/12.22.12/run.sh @@ -20,8 +20,16 @@ if [[ "$RUN_INSTALL" -eq "1" ]]; then fi -if [[ "$PACKAGE_MANAGER" == "npm" ]]; then - npm run $EXEC_SCRIPT -elif [[ "$PACKAGE_MANAGER" == "yarn" ]]; then - yarn run $EXEC_SCRIPT +if [[ "$CUSTOM_SCRIPT" -eq "1" ]]; then + $EXEC_SCRIPT +else + if [[ "$PACKAGE_MANAGER" == "npm" ]]; then + npm run $EXEC_SCRIPT + elif [[ "$PACKAGE_MANAGER" == "yarn" ]]; then + yarn run $EXEC_SCRIPT + fi fi + + + + diff --git a/apps/php5/5.4.45/build/php/extensions/redis-4.1.1.tgz b/apps/php5/5.4.45/build/php/extensions/redis-4.1.1.tgz new file mode 100644 index 000000000..95d3f7436 Binary files /dev/null and b/apps/php5/5.4.45/build/php/extensions/redis-4.1.1.tgz differ diff --git a/apps/php5/5.4.45/build/php/extensions/xdebug-2.4.1.tgz b/apps/php5/5.4.45/build/php/extensions/xdebug-2.4.1.tgz new file mode 100644 index 000000000..59afc8f96 Binary files /dev/null and b/apps/php5/5.4.45/build/php/extensions/xdebug-2.4.1.tgz differ diff --git a/apps/php5/5.4.45/build/php/extensions/zendopcache-7.0.5.tgz b/apps/php5/5.4.45/build/php/extensions/zendopcache-7.0.5.tgz new file mode 100644 index 000000000..aee8761c0 Binary files /dev/null and b/apps/php5/5.4.45/build/php/extensions/zendopcache-7.0.5.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/amqp-1.11.0.tgz b/apps/php5/5.5.38/build/php/extensions/amqp-1.11.0.tgz new file mode 100644 index 000000000..4b32465b1 Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/amqp-1.11.0.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/apcu-4.0.8.tgz b/apps/php5/5.5.38/build/php/extensions/apcu-4.0.8.tgz new file mode 100644 index 000000000..c7f75bce6 Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/apcu-4.0.8.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/event-3.0.8.tgz b/apps/php5/5.5.38/build/php/extensions/event-3.0.8.tgz new file mode 100644 index 000000000..e7a471bbe Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/event-3.0.8.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/memcache-2.2.7.tgz b/apps/php5/5.5.38/build/php/extensions/memcache-2.2.7.tgz new file mode 100644 index 000000000..a3c453416 Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/memcache-2.2.7.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/mongodb-1.6.0.tgz b/apps/php5/5.5.38/build/php/extensions/mongodb-1.6.0.tgz new file mode 100644 index 000000000..eb98c8186 Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/mongodb-1.6.0.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/redis-4.3.0.tgz b/apps/php5/5.5.38/build/php/extensions/redis-4.3.0.tgz new file mode 100644 index 000000000..c4a9ffcfe Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/redis-4.3.0.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/swoole-2.0.11.tgz b/apps/php5/5.5.38/build/php/extensions/swoole-2.0.11.tgz new file mode 100644 index 000000000..a155450ce Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/swoole-2.0.11.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/xdebug-2.5.5.tgz b/apps/php5/5.5.38/build/php/extensions/xdebug-2.5.5.tgz new file mode 100644 index 000000000..d62c7ff63 Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/xdebug-2.5.5.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/xhprof-0.9.4.tgz b/apps/php5/5.5.38/build/php/extensions/xhprof-0.9.4.tgz new file mode 100644 index 000000000..127117911 Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/xhprof-0.9.4.tgz differ diff --git a/apps/php5/5.5.38/build/php/extensions/yaf-3.0.9.tgz b/apps/php5/5.5.38/build/php/extensions/yaf-3.0.9.tgz new file mode 100644 index 000000000..492c1fdc3 Binary files /dev/null and b/apps/php5/5.5.38/build/php/extensions/yaf-3.0.9.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/amqp-1.11.0.tgz b/apps/php5/5.6.40/build/php/extensions/amqp-1.11.0.tgz new file mode 100644 index 000000000..4b32465b1 Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/amqp-1.11.0.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/apcu-4.0.8.tgz b/apps/php5/5.6.40/build/php/extensions/apcu-4.0.8.tgz new file mode 100644 index 000000000..c7f75bce6 Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/apcu-4.0.8.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/event-3.0.8.tgz b/apps/php5/5.6.40/build/php/extensions/event-3.0.8.tgz new file mode 100644 index 000000000..e7a471bbe Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/event-3.0.8.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/memcache-2.2.7.tgz b/apps/php5/5.6.40/build/php/extensions/memcache-2.2.7.tgz new file mode 100644 index 000000000..a3c453416 Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/memcache-2.2.7.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/mongodb-1.6.0.tgz b/apps/php5/5.6.40/build/php/extensions/mongodb-1.6.0.tgz new file mode 100644 index 000000000..eb98c8186 Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/mongodb-1.6.0.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/redis-4.3.0.tgz b/apps/php5/5.6.40/build/php/extensions/redis-4.3.0.tgz new file mode 100644 index 000000000..c4a9ffcfe Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/redis-4.3.0.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/swoole-2.0.11.tgz b/apps/php5/5.6.40/build/php/extensions/swoole-2.0.11.tgz new file mode 100644 index 000000000..a155450ce Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/swoole-2.0.11.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/xdebug-2.5.5.tgz b/apps/php5/5.6.40/build/php/extensions/xdebug-2.5.5.tgz new file mode 100644 index 000000000..d62c7ff63 Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/xdebug-2.5.5.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/xhprof-0.9.4.tgz b/apps/php5/5.6.40/build/php/extensions/xhprof-0.9.4.tgz new file mode 100644 index 000000000..127117911 Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/xhprof-0.9.4.tgz differ diff --git a/apps/php5/5.6.40/build/php/extensions/yaf-3.0.9.tgz b/apps/php5/5.6.40/build/php/extensions/yaf-3.0.9.tgz new file mode 100644 index 000000000..492c1fdc3 Binary files /dev/null and b/apps/php5/5.6.40/build/php/extensions/yaf-3.0.9.tgz differ diff --git a/apps/php7/7.0.33/build/php/extensions/event-2.5.6.tgz b/apps/php7/7.0.33/build/php/extensions/event-2.5.6.tgz deleted file mode 100644 index ed10e2a37..000000000 Binary files a/apps/php7/7.0.33/build/php/extensions/event-2.5.6.tgz and /dev/null differ diff --git a/apps/php7/7.0.33/build/php/extensions/event-3.0.8.tgz b/apps/php7/7.0.33/build/php/extensions/event-3.0.8.tgz new file mode 100644 index 000000000..e7a471bbe Binary files /dev/null and b/apps/php7/7.0.33/build/php/extensions/event-3.0.8.tgz differ 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 27e6418a1..3950ddb8b 100644 --- a/apps/php7/7.0.33/build/php/extensions/install.sh +++ b/apps/php7/7.0.33/build/php/extensions/install.sh @@ -60,36 +60,17 @@ isPhpVersionGreaterOrEqual() installExtensionFromTgz() { tgzName=$1 - para1= - extensionName="${tgzName%%-*}" - - if [ $2 ]; then - para1=$2 - fi + result="" + extensionName="${tgzName%%-*}" + shift 1 + result=$@ mkdir ${extensionName} tar -xf ${tgzName}.tgz -C ${extensionName} --strip-components=1 - ( cd ${extensionName} && phpize && ./configure ${para1} && make ${MC} && make install ) + ( cd ${extensionName} && phpize && ./configure ${result} && make ${MC} && make install ) docker-php-ext-enable ${extensionName} } -# install use install-php-extensions -if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then - echo "---------- Install ioncube_loader ----------" - install-php-extensions ioncube_loader -fi - -if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then - echo "---------- Install imagick ----------" - install-php-extensions imagick -fi - -if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then - echo "---------- Install sourceguardian ----------" - install-php-extensions sourceguardian -fi -# end - if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then echo "---------- Install pdo_mysql ----------" @@ -469,11 +450,29 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - install-php-extensions pdo_sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - install-php-extensions sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then @@ -522,13 +521,7 @@ fi if [[ -z "${EXTENSIONS##*,redis,*}" ]]; then echo "---------- Install redis ----------" - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - installExtensionFromTgz redis-5.2.2 - else - printf "\n" | pecl install redis-4.3.0 - docker-php-ext-enable redis - fi + installExtensionFromTgz redis-5.3.7 fi if [[ -z "${EXTENSIONS##*,apcu,*}" ]]; then @@ -587,12 +580,18 @@ if [[ -z "${EXTENSIONS##*,event,*}" ]]; then fi echo "---------- Install event again ----------" - installExtensionFromTgz event-2.5.6 "--ini-name event.ini" + mkdir event + tar -xf event-3.0.8.tgz -C event --strip-components=1 + cd event && phpize && ./configure && make && make install + + docker-php-ext-enable --ini-name event.ini event fi if [[ -z "${EXTENSIONS##*,mongodb,*}" ]]; then echo "---------- Install mongodb ----------" + apk add --no-cache openssl-dev installExtensionFromTgz mongodb-1.7.4 + docker-php-ext-configure mongodb --with-mongodb-ssl=openssl fi if [[ -z "${EXTENSIONS##*,yaf,*}" ]]; then @@ -616,7 +615,7 @@ if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then - installExtensionFromTgz swoole-4.5.2 + installExtensionFromTgz swoole-4.8.11 --enable-openssl else installExtensionFromTgz swoole-2.0.11 fi diff --git a/apps/php7/7.0.33/build/php/extensions/redis-5.2.2.tgz b/apps/php7/7.0.33/build/php/extensions/redis-5.2.2.tgz deleted file mode 100644 index a0a2b5af1..000000000 Binary files a/apps/php7/7.0.33/build/php/extensions/redis-5.2.2.tgz and /dev/null differ diff --git a/apps/php7/7.0.33/build/php/extensions/redis-5.3.7.tgz b/apps/php7/7.0.33/build/php/extensions/redis-5.3.7.tgz new file mode 100644 index 000000000..db2187b4d Binary files /dev/null and b/apps/php7/7.0.33/build/php/extensions/redis-5.3.7.tgz differ diff --git a/apps/php7/7.0.33/build/php/extensions/swoole-4.5.2.tgz b/apps/php7/7.0.33/build/php/extensions/swoole-4.5.2.tgz deleted file mode 100644 index 215550fcd..000000000 Binary files a/apps/php7/7.0.33/build/php/extensions/swoole-4.5.2.tgz and /dev/null differ diff --git a/apps/php7/7.0.33/build/php/extensions/swoole-4.8.11.tgz b/apps/php7/7.0.33/build/php/extensions/swoole-4.8.11.tgz new file mode 100644 index 000000000..01674cdc9 Binary files /dev/null and b/apps/php7/7.0.33/build/php/extensions/swoole-4.8.11.tgz differ diff --git a/apps/php7/7.1.33/build/php/extensions/event-2.5.6.tgz b/apps/php7/7.1.33/build/php/extensions/event-2.5.6.tgz deleted file mode 100644 index ed10e2a37..000000000 Binary files a/apps/php7/7.1.33/build/php/extensions/event-2.5.6.tgz and /dev/null differ diff --git a/apps/php7/7.1.33/build/php/extensions/event-3.0.8.tgz b/apps/php7/7.1.33/build/php/extensions/event-3.0.8.tgz new file mode 100644 index 000000000..e7a471bbe Binary files /dev/null and b/apps/php7/7.1.33/build/php/extensions/event-3.0.8.tgz differ 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 27e6418a1..3950ddb8b 100644 --- a/apps/php7/7.1.33/build/php/extensions/install.sh +++ b/apps/php7/7.1.33/build/php/extensions/install.sh @@ -60,36 +60,17 @@ isPhpVersionGreaterOrEqual() installExtensionFromTgz() { tgzName=$1 - para1= - extensionName="${tgzName%%-*}" - - if [ $2 ]; then - para1=$2 - fi + result="" + extensionName="${tgzName%%-*}" + shift 1 + result=$@ mkdir ${extensionName} tar -xf ${tgzName}.tgz -C ${extensionName} --strip-components=1 - ( cd ${extensionName} && phpize && ./configure ${para1} && make ${MC} && make install ) + ( cd ${extensionName} && phpize && ./configure ${result} && make ${MC} && make install ) docker-php-ext-enable ${extensionName} } -# install use install-php-extensions -if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then - echo "---------- Install ioncube_loader ----------" - install-php-extensions ioncube_loader -fi - -if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then - echo "---------- Install imagick ----------" - install-php-extensions imagick -fi - -if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then - echo "---------- Install sourceguardian ----------" - install-php-extensions sourceguardian -fi -# end - if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then echo "---------- Install pdo_mysql ----------" @@ -469,11 +450,29 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - install-php-extensions pdo_sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - install-php-extensions sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then @@ -522,13 +521,7 @@ fi if [[ -z "${EXTENSIONS##*,redis,*}" ]]; then echo "---------- Install redis ----------" - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - installExtensionFromTgz redis-5.2.2 - else - printf "\n" | pecl install redis-4.3.0 - docker-php-ext-enable redis - fi + installExtensionFromTgz redis-5.3.7 fi if [[ -z "${EXTENSIONS##*,apcu,*}" ]]; then @@ -587,12 +580,18 @@ if [[ -z "${EXTENSIONS##*,event,*}" ]]; then fi echo "---------- Install event again ----------" - installExtensionFromTgz event-2.5.6 "--ini-name event.ini" + mkdir event + tar -xf event-3.0.8.tgz -C event --strip-components=1 + cd event && phpize && ./configure && make && make install + + docker-php-ext-enable --ini-name event.ini event fi if [[ -z "${EXTENSIONS##*,mongodb,*}" ]]; then echo "---------- Install mongodb ----------" + apk add --no-cache openssl-dev installExtensionFromTgz mongodb-1.7.4 + docker-php-ext-configure mongodb --with-mongodb-ssl=openssl fi if [[ -z "${EXTENSIONS##*,yaf,*}" ]]; then @@ -616,7 +615,7 @@ if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then - installExtensionFromTgz swoole-4.5.2 + installExtensionFromTgz swoole-4.8.11 --enable-openssl else installExtensionFromTgz swoole-2.0.11 fi diff --git a/apps/php7/7.1.33/build/php/extensions/redis-5.2.2.tgz b/apps/php7/7.1.33/build/php/extensions/redis-5.2.2.tgz deleted file mode 100644 index a0a2b5af1..000000000 Binary files a/apps/php7/7.1.33/build/php/extensions/redis-5.2.2.tgz and /dev/null differ diff --git a/apps/php7/7.1.33/build/php/extensions/redis-5.3.7.tgz b/apps/php7/7.1.33/build/php/extensions/redis-5.3.7.tgz new file mode 100644 index 000000000..db2187b4d Binary files /dev/null and b/apps/php7/7.1.33/build/php/extensions/redis-5.3.7.tgz differ diff --git a/apps/php7/7.1.33/build/php/extensions/swoole-4.5.2.tgz b/apps/php7/7.1.33/build/php/extensions/swoole-4.5.2.tgz deleted file mode 100644 index 215550fcd..000000000 Binary files a/apps/php7/7.1.33/build/php/extensions/swoole-4.5.2.tgz and /dev/null differ diff --git a/apps/php7/7.1.33/build/php/extensions/swoole-4.8.11.tgz b/apps/php7/7.1.33/build/php/extensions/swoole-4.8.11.tgz new file mode 100644 index 000000000..01674cdc9 Binary files /dev/null and b/apps/php7/7.1.33/build/php/extensions/swoole-4.8.11.tgz differ diff --git a/apps/php7/7.2.34/build/php/extensions/event-2.5.6.tgz b/apps/php7/7.2.34/build/php/extensions/event-2.5.6.tgz deleted file mode 100644 index ed10e2a37..000000000 Binary files a/apps/php7/7.2.34/build/php/extensions/event-2.5.6.tgz and /dev/null differ diff --git a/apps/php7/7.2.34/build/php/extensions/event-3.0.8.tgz b/apps/php7/7.2.34/build/php/extensions/event-3.0.8.tgz new file mode 100644 index 000000000..e7a471bbe Binary files /dev/null and b/apps/php7/7.2.34/build/php/extensions/event-3.0.8.tgz differ 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 27e6418a1..3950ddb8b 100644 --- a/apps/php7/7.2.34/build/php/extensions/install.sh +++ b/apps/php7/7.2.34/build/php/extensions/install.sh @@ -60,36 +60,17 @@ isPhpVersionGreaterOrEqual() installExtensionFromTgz() { tgzName=$1 - para1= - extensionName="${tgzName%%-*}" - - if [ $2 ]; then - para1=$2 - fi + result="" + extensionName="${tgzName%%-*}" + shift 1 + result=$@ mkdir ${extensionName} tar -xf ${tgzName}.tgz -C ${extensionName} --strip-components=1 - ( cd ${extensionName} && phpize && ./configure ${para1} && make ${MC} && make install ) + ( cd ${extensionName} && phpize && ./configure ${result} && make ${MC} && make install ) docker-php-ext-enable ${extensionName} } -# install use install-php-extensions -if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then - echo "---------- Install ioncube_loader ----------" - install-php-extensions ioncube_loader -fi - -if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then - echo "---------- Install imagick ----------" - install-php-extensions imagick -fi - -if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then - echo "---------- Install sourceguardian ----------" - install-php-extensions sourceguardian -fi -# end - if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then echo "---------- Install pdo_mysql ----------" @@ -469,11 +450,29 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - install-php-extensions pdo_sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - install-php-extensions sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then @@ -522,13 +521,7 @@ fi if [[ -z "${EXTENSIONS##*,redis,*}" ]]; then echo "---------- Install redis ----------" - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - installExtensionFromTgz redis-5.2.2 - else - printf "\n" | pecl install redis-4.3.0 - docker-php-ext-enable redis - fi + installExtensionFromTgz redis-5.3.7 fi if [[ -z "${EXTENSIONS##*,apcu,*}" ]]; then @@ -587,12 +580,18 @@ if [[ -z "${EXTENSIONS##*,event,*}" ]]; then fi echo "---------- Install event again ----------" - installExtensionFromTgz event-2.5.6 "--ini-name event.ini" + mkdir event + tar -xf event-3.0.8.tgz -C event --strip-components=1 + cd event && phpize && ./configure && make && make install + + docker-php-ext-enable --ini-name event.ini event fi if [[ -z "${EXTENSIONS##*,mongodb,*}" ]]; then echo "---------- Install mongodb ----------" + apk add --no-cache openssl-dev installExtensionFromTgz mongodb-1.7.4 + docker-php-ext-configure mongodb --with-mongodb-ssl=openssl fi if [[ -z "${EXTENSIONS##*,yaf,*}" ]]; then @@ -616,7 +615,7 @@ if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then - installExtensionFromTgz swoole-4.5.2 + installExtensionFromTgz swoole-4.8.11 --enable-openssl else installExtensionFromTgz swoole-2.0.11 fi diff --git a/apps/php7/7.2.34/build/php/extensions/redis-5.2.2.tgz b/apps/php7/7.2.34/build/php/extensions/redis-5.2.2.tgz deleted file mode 100644 index a0a2b5af1..000000000 Binary files a/apps/php7/7.2.34/build/php/extensions/redis-5.2.2.tgz and /dev/null differ diff --git a/apps/php7/7.2.34/build/php/extensions/redis-5.3.7.tgz b/apps/php7/7.2.34/build/php/extensions/redis-5.3.7.tgz new file mode 100644 index 000000000..db2187b4d Binary files /dev/null and b/apps/php7/7.2.34/build/php/extensions/redis-5.3.7.tgz differ diff --git a/apps/php7/7.2.34/build/php/extensions/swoole-4.5.2.tgz b/apps/php7/7.2.34/build/php/extensions/swoole-4.5.2.tgz deleted file mode 100644 index 215550fcd..000000000 Binary files a/apps/php7/7.2.34/build/php/extensions/swoole-4.5.2.tgz and /dev/null differ diff --git a/apps/php7/7.2.34/build/php/extensions/swoole-4.8.11.tgz b/apps/php7/7.2.34/build/php/extensions/swoole-4.8.11.tgz new file mode 100644 index 000000000..01674cdc9 Binary files /dev/null and b/apps/php7/7.2.34/build/php/extensions/swoole-4.8.11.tgz differ diff --git a/apps/php7/7.3.33/build/php/extensions/event-2.5.6.tgz b/apps/php7/7.3.33/build/php/extensions/event-2.5.6.tgz deleted file mode 100644 index ed10e2a37..000000000 Binary files a/apps/php7/7.3.33/build/php/extensions/event-2.5.6.tgz and /dev/null differ diff --git a/apps/php7/7.3.33/build/php/extensions/event-3.0.8.tgz b/apps/php7/7.3.33/build/php/extensions/event-3.0.8.tgz new file mode 100644 index 000000000..e7a471bbe Binary files /dev/null and b/apps/php7/7.3.33/build/php/extensions/event-3.0.8.tgz differ 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 27e6418a1..3950ddb8b 100644 --- a/apps/php7/7.3.33/build/php/extensions/install.sh +++ b/apps/php7/7.3.33/build/php/extensions/install.sh @@ -60,36 +60,17 @@ isPhpVersionGreaterOrEqual() installExtensionFromTgz() { tgzName=$1 - para1= - extensionName="${tgzName%%-*}" - - if [ $2 ]; then - para1=$2 - fi + result="" + extensionName="${tgzName%%-*}" + shift 1 + result=$@ mkdir ${extensionName} tar -xf ${tgzName}.tgz -C ${extensionName} --strip-components=1 - ( cd ${extensionName} && phpize && ./configure ${para1} && make ${MC} && make install ) + ( cd ${extensionName} && phpize && ./configure ${result} && make ${MC} && make install ) docker-php-ext-enable ${extensionName} } -# install use install-php-extensions -if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then - echo "---------- Install ioncube_loader ----------" - install-php-extensions ioncube_loader -fi - -if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then - echo "---------- Install imagick ----------" - install-php-extensions imagick -fi - -if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then - echo "---------- Install sourceguardian ----------" - install-php-extensions sourceguardian -fi -# end - if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then echo "---------- Install pdo_mysql ----------" @@ -469,11 +450,29 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - install-php-extensions pdo_sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - install-php-extensions sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then @@ -522,13 +521,7 @@ fi if [[ -z "${EXTENSIONS##*,redis,*}" ]]; then echo "---------- Install redis ----------" - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - installExtensionFromTgz redis-5.2.2 - else - printf "\n" | pecl install redis-4.3.0 - docker-php-ext-enable redis - fi + installExtensionFromTgz redis-5.3.7 fi if [[ -z "${EXTENSIONS##*,apcu,*}" ]]; then @@ -587,12 +580,18 @@ if [[ -z "${EXTENSIONS##*,event,*}" ]]; then fi echo "---------- Install event again ----------" - installExtensionFromTgz event-2.5.6 "--ini-name event.ini" + mkdir event + tar -xf event-3.0.8.tgz -C event --strip-components=1 + cd event && phpize && ./configure && make && make install + + docker-php-ext-enable --ini-name event.ini event fi if [[ -z "${EXTENSIONS##*,mongodb,*}" ]]; then echo "---------- Install mongodb ----------" + apk add --no-cache openssl-dev installExtensionFromTgz mongodb-1.7.4 + docker-php-ext-configure mongodb --with-mongodb-ssl=openssl fi if [[ -z "${EXTENSIONS##*,yaf,*}" ]]; then @@ -616,7 +615,7 @@ if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then - installExtensionFromTgz swoole-4.5.2 + installExtensionFromTgz swoole-4.8.11 --enable-openssl else installExtensionFromTgz swoole-2.0.11 fi diff --git a/apps/php7/7.3.33/build/php/extensions/redis-5.2.2.tgz b/apps/php7/7.3.33/build/php/extensions/redis-5.2.2.tgz deleted file mode 100644 index a0a2b5af1..000000000 Binary files a/apps/php7/7.3.33/build/php/extensions/redis-5.2.2.tgz and /dev/null differ diff --git a/apps/php7/7.3.33/build/php/extensions/redis-5.3.7.tgz b/apps/php7/7.3.33/build/php/extensions/redis-5.3.7.tgz new file mode 100644 index 000000000..db2187b4d Binary files /dev/null and b/apps/php7/7.3.33/build/php/extensions/redis-5.3.7.tgz differ diff --git a/apps/php7/7.3.33/build/php/extensions/swoole-4.5.2.tgz b/apps/php7/7.3.33/build/php/extensions/swoole-4.5.2.tgz deleted file mode 100644 index 215550fcd..000000000 Binary files a/apps/php7/7.3.33/build/php/extensions/swoole-4.5.2.tgz and /dev/null differ diff --git a/apps/php7/7.3.33/build/php/extensions/swoole-4.8.11.tgz b/apps/php7/7.3.33/build/php/extensions/swoole-4.8.11.tgz new file mode 100644 index 000000000..01674cdc9 Binary files /dev/null and b/apps/php7/7.3.33/build/php/extensions/swoole-4.8.11.tgz differ diff --git a/apps/php7/7.4.33/build/php/extensions/event-2.5.6.tgz b/apps/php7/7.4.33/build/php/extensions/event-2.5.6.tgz deleted file mode 100644 index ed10e2a37..000000000 Binary files a/apps/php7/7.4.33/build/php/extensions/event-2.5.6.tgz and /dev/null differ diff --git a/apps/php7/7.4.33/build/php/extensions/event-3.0.8.tgz b/apps/php7/7.4.33/build/php/extensions/event-3.0.8.tgz new file mode 100644 index 000000000..e7a471bbe Binary files /dev/null and b/apps/php7/7.4.33/build/php/extensions/event-3.0.8.tgz differ 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 27e6418a1..3950ddb8b 100644 --- a/apps/php7/7.4.33/build/php/extensions/install.sh +++ b/apps/php7/7.4.33/build/php/extensions/install.sh @@ -60,36 +60,17 @@ isPhpVersionGreaterOrEqual() installExtensionFromTgz() { tgzName=$1 - para1= - extensionName="${tgzName%%-*}" - - if [ $2 ]; then - para1=$2 - fi + result="" + extensionName="${tgzName%%-*}" + shift 1 + result=$@ mkdir ${extensionName} tar -xf ${tgzName}.tgz -C ${extensionName} --strip-components=1 - ( cd ${extensionName} && phpize && ./configure ${para1} && make ${MC} && make install ) + ( cd ${extensionName} && phpize && ./configure ${result} && make ${MC} && make install ) docker-php-ext-enable ${extensionName} } -# install use install-php-extensions -if [[ -z "${EXTENSIONS##*,ioncube_loader,*}" ]]; then - echo "---------- Install ioncube_loader ----------" - install-php-extensions ioncube_loader -fi - -if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then - echo "---------- Install imagick ----------" - install-php-extensions imagick -fi - -if [[ -z "${EXTENSIONS##*,sourceguardian,*}" ]]; then - echo "---------- Install sourceguardian ----------" - install-php-extensions sourceguardian -fi -# end - if [[ -z "${EXTENSIONS##*,pdo_mysql,*}" ]]; then echo "---------- Install pdo_mysql ----------" @@ -469,11 +450,29 @@ if [[ -z "${EXTENSIONS##*,varnish,*}" ]]; then fi if [[ -z "${EXTENSIONS##*,pdo_sqlsrv,*}" ]]; then - install-php-extensions pdo_sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,sqlsrv,*}" ]]; then - install-php-extensions sqlsrv + 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 fi if [[ -z "${EXTENSIONS##*,mcrypt,*}" ]]; then @@ -522,13 +521,7 @@ fi if [[ -z "${EXTENSIONS##*,redis,*}" ]]; then echo "---------- Install redis ----------" - isPhpVersionGreaterOrEqual 7 0 - if [[ "$?" = "1" ]]; then - installExtensionFromTgz redis-5.2.2 - else - printf "\n" | pecl install redis-4.3.0 - docker-php-ext-enable redis - fi + installExtensionFromTgz redis-5.3.7 fi if [[ -z "${EXTENSIONS##*,apcu,*}" ]]; then @@ -587,12 +580,18 @@ if [[ -z "${EXTENSIONS##*,event,*}" ]]; then fi echo "---------- Install event again ----------" - installExtensionFromTgz event-2.5.6 "--ini-name event.ini" + mkdir event + tar -xf event-3.0.8.tgz -C event --strip-components=1 + cd event && phpize && ./configure && make && make install + + docker-php-ext-enable --ini-name event.ini event fi if [[ -z "${EXTENSIONS##*,mongodb,*}" ]]; then echo "---------- Install mongodb ----------" + apk add --no-cache openssl-dev installExtensionFromTgz mongodb-1.7.4 + docker-php-ext-configure mongodb --with-mongodb-ssl=openssl fi if [[ -z "${EXTENSIONS##*,yaf,*}" ]]; then @@ -616,7 +615,7 @@ if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then isPhpVersionGreaterOrEqual 7 0 if [[ "$?" = "1" ]]; then - installExtensionFromTgz swoole-4.5.2 + installExtensionFromTgz swoole-4.8.11 --enable-openssl else installExtensionFromTgz swoole-2.0.11 fi diff --git a/apps/php7/7.4.33/build/php/extensions/redis-5.2.2.tgz b/apps/php7/7.4.33/build/php/extensions/redis-5.2.2.tgz deleted file mode 100644 index a0a2b5af1..000000000 Binary files a/apps/php7/7.4.33/build/php/extensions/redis-5.2.2.tgz and /dev/null differ diff --git a/apps/php7/7.4.33/build/php/extensions/redis-5.3.7.tgz b/apps/php7/7.4.33/build/php/extensions/redis-5.3.7.tgz new file mode 100644 index 000000000..db2187b4d Binary files /dev/null and b/apps/php7/7.4.33/build/php/extensions/redis-5.3.7.tgz differ diff --git a/apps/php7/7.4.33/build/php/extensions/swoole-4.5.2.tgz b/apps/php7/7.4.33/build/php/extensions/swoole-4.5.2.tgz deleted file mode 100644 index 215550fcd..000000000 Binary files a/apps/php7/7.4.33/build/php/extensions/swoole-4.5.2.tgz and /dev/null differ diff --git a/apps/php7/7.4.33/build/php/extensions/swoole-4.8.11.tgz b/apps/php7/7.4.33/build/php/extensions/swoole-4.8.11.tgz new file mode 100644 index 000000000..01674cdc9 Binary files /dev/null and b/apps/php7/7.4.33/build/php/extensions/swoole-4.8.11.tgz differ