diff --git a/php8/8.0.30/build/php/extensions/install-php-extensions b/php8/8.0.30/build/php/extensions/install-php-extensions index 2ef98bb85..ffe08e487 100644 --- a/php8/8.0.30/build/php/extensions/install-php-extensions +++ b/php8/8.0.30/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=2.7.27 +IPE_VERSION=2.7.31 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -273,15 +273,6 @@ EOT # Nothing processPHPModuleArgument() { processPHPModuleArgument_arg="$1" - case "$processPHPModuleArgument_arg" in - imagick) - if test $PHP_MAJMIN_VERSION -ge 804; then - processPHPModuleArgument_arg=imagick/imagick@65e27f2bc02e7e8f1bf64e26e359e42a1331fca1 - elif test $PHP_MAJMIN_VERSION -ge 803; then - processPHPModuleArgument_arg=imagick/imagick@28f27044e435a2b203e32675e942eb8de620ee58 - fi - ;; - esac # Convert GitHub short form to long url, # for example: from # php-memcached-dev/php-memcached@8f106564e6bb005ca6100b12ccc89000daafa9d8 @@ -2546,10 +2537,12 @@ actuallyInstallComposer() { # Install ionCube Loader installIonCubeLoader() { installIonCubeLoader_version='' - if test $PHP_MAJMIN_VERSION -lt 804; then - # For 14.4.0 we have a Segmentation Fault - installIonCubeLoader_version=14.0.0 - fi + case "$DISTRO" in + alpine) + # For 14.4.0 we have a Segmentation Fault + installIonCubeLoader_version=14.0.0 + ;; + esac installIonCubeLoader_versionForUrl='' installIonCubeLoader_versionForMessage=latest if test -n "$installIonCubeLoader_version"; then @@ -3252,9 +3245,9 @@ installRemoteModule() { geos) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0def35611f773c951432f1f06a155471a5cb7611 + installRemoteModule_version=dfe1ab17b0f155cc315bc13c75689371676e02e1 fi - installRemoteModule_src="$(getPackageSource https://git.osgeo.org/gitea/geos/php-geos/archive/$installRemoteModule_version.tar.gz)" + installRemoteModule_src="$(getPackageSource https://github.com/libgeos/php-geos/archive/$installRemoteModule_version.tar.gz)" cd "$installRemoteModule_src" ./autogen.sh ./configure @@ -3337,6 +3330,13 @@ installRemoteModule() { # Include SSL Support addConfigureOption with-imap-ssl yes ;; + imagick) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -lt 506; then + installRemoteModule_version=3.7.0 + fi + fi + ;; inotify) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -4409,6 +4409,8 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 703; then installRemoteModule_version=2.2.3 + elif test $PHP_MAJMIN_VERSION -le 704; then + installRemoteModule_version=3.0.5 fi fi case "$DISTRO" in diff --git a/php8/8.0.30/build/php/extensions/install.sh b/php8/8.0.30/build/php/extensions/install.sh index 464c600b3..45d65e3db 100644 --- a/php8/8.0.30/build/php/extensions/install.sh +++ b/php8/8.0.30/build/php/extensions/install.sh @@ -396,7 +396,7 @@ fi if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then echo "---------- Install imagick ----------" apk add --no-cache file-dev - apk add --no-cache imagemagick imagemagick-dev + apk add --no-cache imagemagick imagemagick-dev imagemagick-pdf # cd imagick-3.7.0 && phpize && ./configure # make # make install diff --git a/php8/8.1.31/build/php/extensions/install-php-extensions b/php8/8.1.31/build/php/extensions/install-php-extensions index 2ef98bb85..ffe08e487 100644 --- a/php8/8.1.31/build/php/extensions/install-php-extensions +++ b/php8/8.1.31/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=2.7.27 +IPE_VERSION=2.7.31 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -273,15 +273,6 @@ EOT # Nothing processPHPModuleArgument() { processPHPModuleArgument_arg="$1" - case "$processPHPModuleArgument_arg" in - imagick) - if test $PHP_MAJMIN_VERSION -ge 804; then - processPHPModuleArgument_arg=imagick/imagick@65e27f2bc02e7e8f1bf64e26e359e42a1331fca1 - elif test $PHP_MAJMIN_VERSION -ge 803; then - processPHPModuleArgument_arg=imagick/imagick@28f27044e435a2b203e32675e942eb8de620ee58 - fi - ;; - esac # Convert GitHub short form to long url, # for example: from # php-memcached-dev/php-memcached@8f106564e6bb005ca6100b12ccc89000daafa9d8 @@ -2546,10 +2537,12 @@ actuallyInstallComposer() { # Install ionCube Loader installIonCubeLoader() { installIonCubeLoader_version='' - if test $PHP_MAJMIN_VERSION -lt 804; then - # For 14.4.0 we have a Segmentation Fault - installIonCubeLoader_version=14.0.0 - fi + case "$DISTRO" in + alpine) + # For 14.4.0 we have a Segmentation Fault + installIonCubeLoader_version=14.0.0 + ;; + esac installIonCubeLoader_versionForUrl='' installIonCubeLoader_versionForMessage=latest if test -n "$installIonCubeLoader_version"; then @@ -3252,9 +3245,9 @@ installRemoteModule() { geos) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0def35611f773c951432f1f06a155471a5cb7611 + installRemoteModule_version=dfe1ab17b0f155cc315bc13c75689371676e02e1 fi - installRemoteModule_src="$(getPackageSource https://git.osgeo.org/gitea/geos/php-geos/archive/$installRemoteModule_version.tar.gz)" + installRemoteModule_src="$(getPackageSource https://github.com/libgeos/php-geos/archive/$installRemoteModule_version.tar.gz)" cd "$installRemoteModule_src" ./autogen.sh ./configure @@ -3337,6 +3330,13 @@ installRemoteModule() { # Include SSL Support addConfigureOption with-imap-ssl yes ;; + imagick) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -lt 506; then + installRemoteModule_version=3.7.0 + fi + fi + ;; inotify) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -4409,6 +4409,8 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 703; then installRemoteModule_version=2.2.3 + elif test $PHP_MAJMIN_VERSION -le 704; then + installRemoteModule_version=3.0.5 fi fi case "$DISTRO" in diff --git a/php8/8.1.31/build/php/extensions/install.sh b/php8/8.1.31/build/php/extensions/install.sh index 464c600b3..45d65e3db 100644 --- a/php8/8.1.31/build/php/extensions/install.sh +++ b/php8/8.1.31/build/php/extensions/install.sh @@ -396,7 +396,7 @@ fi if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then echo "---------- Install imagick ----------" apk add --no-cache file-dev - apk add --no-cache imagemagick imagemagick-dev + apk add --no-cache imagemagick imagemagick-dev imagemagick-pdf # cd imagick-3.7.0 && phpize && ./configure # make # make install diff --git a/php8/8.2.27/build/.env b/php8/8.2.28/build/.env similarity index 82% rename from php8/8.2.27/build/.env rename to php8/8.2.28/build/.env index 4190cef7f..6e249fb56 100644 --- a/php8/8.2.27/build/.env +++ b/php8/8.2.28/build/.env @@ -1,6 +1,6 @@ CONTAINER_PACKAGE_URL=mirrors.ustc.edu.cn -PHP_VERSION=8.2.27 +PHP_VERSION=8.2.28 PHP_PHP_CONF_FILE=./php/php.ini PHP_FPM_CONF_FILE=./php/php-fpm.conf PHP_LOG_DIR=./logs/php @@ -10,5 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:8.2.27 +IMAGE_NAME=1panel-php:8.2.28 INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/php8/8.2.27/build/config.json b/php8/8.2.28/build/config.json similarity index 100% rename from php8/8.2.27/build/config.json rename to php8/8.2.28/build/config.json diff --git a/php8/8.2.27/build/docker-compose.yml b/php8/8.2.28/build/docker-compose.yml similarity index 100% rename from php8/8.2.27/build/docker-compose.yml rename to php8/8.2.28/build/docker-compose.yml diff --git a/php8/8.2.27/build/php/Dockerfile b/php8/8.2.28/build/php/Dockerfile similarity index 100% rename from php8/8.2.27/build/php/Dockerfile rename to php8/8.2.28/build/php/Dockerfile diff --git a/php8/8.2.27/build/php/extensions/event-3.0.8.tgz b/php8/8.2.28/build/php/extensions/event-3.0.8.tgz similarity index 100% rename from php8/8.2.27/build/php/extensions/event-3.0.8.tgz rename to php8/8.2.28/build/php/extensions/event-3.0.8.tgz diff --git a/php8/8.2.27/build/php/extensions/imagick-3.7.0.tgz b/php8/8.2.28/build/php/extensions/imagick-3.7.0.tgz similarity index 100% rename from php8/8.2.27/build/php/extensions/imagick-3.7.0.tgz rename to php8/8.2.28/build/php/extensions/imagick-3.7.0.tgz diff --git a/php8/8.2.27/build/php/extensions/install-composer.sh b/php8/8.2.28/build/php/extensions/install-composer.sh similarity index 100% rename from php8/8.2.27/build/php/extensions/install-composer.sh rename to php8/8.2.28/build/php/extensions/install-composer.sh diff --git a/php8/8.3.16/build/php/extensions/install-php-extensions b/php8/8.2.28/build/php/extensions/install-php-extensions similarity index 99% rename from php8/8.3.16/build/php/extensions/install-php-extensions rename to php8/8.2.28/build/php/extensions/install-php-extensions index 2ef98bb85..ffe08e487 100644 --- a/php8/8.3.16/build/php/extensions/install-php-extensions +++ b/php8/8.2.28/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=2.7.27 +IPE_VERSION=2.7.31 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -273,15 +273,6 @@ EOT # Nothing processPHPModuleArgument() { processPHPModuleArgument_arg="$1" - case "$processPHPModuleArgument_arg" in - imagick) - if test $PHP_MAJMIN_VERSION -ge 804; then - processPHPModuleArgument_arg=imagick/imagick@65e27f2bc02e7e8f1bf64e26e359e42a1331fca1 - elif test $PHP_MAJMIN_VERSION -ge 803; then - processPHPModuleArgument_arg=imagick/imagick@28f27044e435a2b203e32675e942eb8de620ee58 - fi - ;; - esac # Convert GitHub short form to long url, # for example: from # php-memcached-dev/php-memcached@8f106564e6bb005ca6100b12ccc89000daafa9d8 @@ -2546,10 +2537,12 @@ actuallyInstallComposer() { # Install ionCube Loader installIonCubeLoader() { installIonCubeLoader_version='' - if test $PHP_MAJMIN_VERSION -lt 804; then - # For 14.4.0 we have a Segmentation Fault - installIonCubeLoader_version=14.0.0 - fi + case "$DISTRO" in + alpine) + # For 14.4.0 we have a Segmentation Fault + installIonCubeLoader_version=14.0.0 + ;; + esac installIonCubeLoader_versionForUrl='' installIonCubeLoader_versionForMessage=latest if test -n "$installIonCubeLoader_version"; then @@ -3252,9 +3245,9 @@ installRemoteModule() { geos) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0def35611f773c951432f1f06a155471a5cb7611 + installRemoteModule_version=dfe1ab17b0f155cc315bc13c75689371676e02e1 fi - installRemoteModule_src="$(getPackageSource https://git.osgeo.org/gitea/geos/php-geos/archive/$installRemoteModule_version.tar.gz)" + installRemoteModule_src="$(getPackageSource https://github.com/libgeos/php-geos/archive/$installRemoteModule_version.tar.gz)" cd "$installRemoteModule_src" ./autogen.sh ./configure @@ -3337,6 +3330,13 @@ installRemoteModule() { # Include SSL Support addConfigureOption with-imap-ssl yes ;; + imagick) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -lt 506; then + installRemoteModule_version=3.7.0 + fi + fi + ;; inotify) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -4409,6 +4409,8 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 703; then installRemoteModule_version=2.2.3 + elif test $PHP_MAJMIN_VERSION -le 704; then + installRemoteModule_version=3.0.5 fi fi case "$DISTRO" in diff --git a/php8/8.3.16/build/php/extensions/install.sh b/php8/8.2.28/build/php/extensions/install.sh similarity index 99% rename from php8/8.3.16/build/php/extensions/install.sh rename to php8/8.2.28/build/php/extensions/install.sh index 464c600b3..45d65e3db 100644 --- a/php8/8.3.16/build/php/extensions/install.sh +++ b/php8/8.2.28/build/php/extensions/install.sh @@ -396,7 +396,7 @@ fi if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then echo "---------- Install imagick ----------" apk add --no-cache file-dev - apk add --no-cache imagemagick imagemagick-dev + apk add --no-cache imagemagick imagemagick-dev imagemagick-pdf # cd imagick-3.7.0 && phpize && ./configure # make # make install diff --git a/php8/8.2.27/build/php/extensions/mongodb-1.15.2.tgz b/php8/8.2.28/build/php/extensions/mongodb-1.15.2.tgz similarity index 100% rename from php8/8.2.27/build/php/extensions/mongodb-1.15.2.tgz rename to php8/8.2.28/build/php/extensions/mongodb-1.15.2.tgz diff --git a/php8/8.2.27/build/php/extensions/redis-6.0.2.tgz b/php8/8.2.28/build/php/extensions/redis-6.0.2.tgz similarity index 100% rename from php8/8.2.27/build/php/extensions/redis-6.0.2.tgz rename to php8/8.2.28/build/php/extensions/redis-6.0.2.tgz diff --git a/php8/8.2.27/build/php/extensions/swoole-5.0.2.tgz b/php8/8.2.28/build/php/extensions/swoole-5.0.2.tgz similarity index 100% rename from php8/8.2.27/build/php/extensions/swoole-5.0.2.tgz rename to php8/8.2.28/build/php/extensions/swoole-5.0.2.tgz diff --git a/php8/8.2.27/build/php/extensions/xdebug-3.2.0.tgz b/php8/8.2.28/build/php/extensions/xdebug-3.2.0.tgz similarity index 100% rename from php8/8.2.27/build/php/extensions/xdebug-3.2.0.tgz rename to php8/8.2.28/build/php/extensions/xdebug-3.2.0.tgz diff --git a/php8/8.2.27/build/php/php-fpm.conf b/php8/8.2.28/build/php/php-fpm.conf similarity index 100% rename from php8/8.2.27/build/php/php-fpm.conf rename to php8/8.2.28/build/php/php-fpm.conf diff --git a/php8/8.2.27/build/php/php.ini b/php8/8.2.28/build/php/php.ini similarity index 100% rename from php8/8.2.27/build/php/php.ini rename to php8/8.2.28/build/php/php.ini diff --git a/php8/8.2.27/conf/php-fpm.conf b/php8/8.2.28/conf/php-fpm.conf similarity index 100% rename from php8/8.2.27/conf/php-fpm.conf rename to php8/8.2.28/conf/php-fpm.conf diff --git a/php8/8.2.27/conf/php.ini b/php8/8.2.28/conf/php.ini similarity index 100% rename from php8/8.2.27/conf/php.ini rename to php8/8.2.28/conf/php.ini diff --git a/php8/8.2.27/data.yml b/php8/8.2.28/data.yml similarity index 100% rename from php8/8.2.27/data.yml rename to php8/8.2.28/data.yml diff --git a/php8/8.2.27/docker-compose.yml b/php8/8.2.28/docker-compose.yml similarity index 100% rename from php8/8.2.27/docker-compose.yml rename to php8/8.2.28/docker-compose.yml diff --git a/php8/8.3.16/build/.env b/php8/8.3.20/build/.env similarity index 82% rename from php8/8.3.16/build/.env rename to php8/8.3.20/build/.env index f68318de3..58b40dc1d 100644 --- a/php8/8.3.16/build/.env +++ b/php8/8.3.20/build/.env @@ -1,6 +1,6 @@ CONTAINER_PACKAGE_URL=mirrors.ustc.edu.cn -PHP_VERSION=8.3.16 +PHP_VERSION=8.3.20 PHP_PHP_CONF_FILE=./php/php.ini PHP_FPM_CONF_FILE=./php/php-fpm.conf PHP_LOG_DIR=./logs/php @@ -10,5 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:8.3.16 +IMAGE_NAME=1panel-php:8.3.20 INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/php8/8.3.16/build/config.json b/php8/8.3.20/build/config.json similarity index 100% rename from php8/8.3.16/build/config.json rename to php8/8.3.20/build/config.json diff --git a/php8/8.3.16/build/docker-compose.yml b/php8/8.3.20/build/docker-compose.yml similarity index 100% rename from php8/8.3.16/build/docker-compose.yml rename to php8/8.3.20/build/docker-compose.yml diff --git a/php8/8.3.16/build/php/Dockerfile b/php8/8.3.20/build/php/Dockerfile similarity index 100% rename from php8/8.3.16/build/php/Dockerfile rename to php8/8.3.20/build/php/Dockerfile diff --git a/php8/8.3.16/build/php/extensions/event-3.0.8.tgz b/php8/8.3.20/build/php/extensions/event-3.0.8.tgz similarity index 100% rename from php8/8.3.16/build/php/extensions/event-3.0.8.tgz rename to php8/8.3.20/build/php/extensions/event-3.0.8.tgz diff --git a/php8/8.3.16/build/php/extensions/imagick-3.7.0.tgz b/php8/8.3.20/build/php/extensions/imagick-3.7.0.tgz similarity index 100% rename from php8/8.3.16/build/php/extensions/imagick-3.7.0.tgz rename to php8/8.3.20/build/php/extensions/imagick-3.7.0.tgz diff --git a/php8/8.3.16/build/php/extensions/install-composer.sh b/php8/8.3.20/build/php/extensions/install-composer.sh similarity index 100% rename from php8/8.3.16/build/php/extensions/install-composer.sh rename to php8/8.3.20/build/php/extensions/install-composer.sh diff --git a/php8/8.2.27/build/php/extensions/install-php-extensions b/php8/8.3.20/build/php/extensions/install-php-extensions similarity index 99% rename from php8/8.2.27/build/php/extensions/install-php-extensions rename to php8/8.3.20/build/php/extensions/install-php-extensions index 2ef98bb85..ffe08e487 100644 --- a/php8/8.2.27/build/php/extensions/install-php-extensions +++ b/php8/8.3.20/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=2.7.27 +IPE_VERSION=2.7.31 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -273,15 +273,6 @@ EOT # Nothing processPHPModuleArgument() { processPHPModuleArgument_arg="$1" - case "$processPHPModuleArgument_arg" in - imagick) - if test $PHP_MAJMIN_VERSION -ge 804; then - processPHPModuleArgument_arg=imagick/imagick@65e27f2bc02e7e8f1bf64e26e359e42a1331fca1 - elif test $PHP_MAJMIN_VERSION -ge 803; then - processPHPModuleArgument_arg=imagick/imagick@28f27044e435a2b203e32675e942eb8de620ee58 - fi - ;; - esac # Convert GitHub short form to long url, # for example: from # php-memcached-dev/php-memcached@8f106564e6bb005ca6100b12ccc89000daafa9d8 @@ -2546,10 +2537,12 @@ actuallyInstallComposer() { # Install ionCube Loader installIonCubeLoader() { installIonCubeLoader_version='' - if test $PHP_MAJMIN_VERSION -lt 804; then - # For 14.4.0 we have a Segmentation Fault - installIonCubeLoader_version=14.0.0 - fi + case "$DISTRO" in + alpine) + # For 14.4.0 we have a Segmentation Fault + installIonCubeLoader_version=14.0.0 + ;; + esac installIonCubeLoader_versionForUrl='' installIonCubeLoader_versionForMessage=latest if test -n "$installIonCubeLoader_version"; then @@ -3252,9 +3245,9 @@ installRemoteModule() { geos) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0def35611f773c951432f1f06a155471a5cb7611 + installRemoteModule_version=dfe1ab17b0f155cc315bc13c75689371676e02e1 fi - installRemoteModule_src="$(getPackageSource https://git.osgeo.org/gitea/geos/php-geos/archive/$installRemoteModule_version.tar.gz)" + installRemoteModule_src="$(getPackageSource https://github.com/libgeos/php-geos/archive/$installRemoteModule_version.tar.gz)" cd "$installRemoteModule_src" ./autogen.sh ./configure @@ -3337,6 +3330,13 @@ installRemoteModule() { # Include SSL Support addConfigureOption with-imap-ssl yes ;; + imagick) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -lt 506; then + installRemoteModule_version=3.7.0 + fi + fi + ;; inotify) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -4409,6 +4409,8 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 703; then installRemoteModule_version=2.2.3 + elif test $PHP_MAJMIN_VERSION -le 704; then + installRemoteModule_version=3.0.5 fi fi case "$DISTRO" in diff --git a/php8/8.2.27/build/php/extensions/install.sh b/php8/8.3.20/build/php/extensions/install.sh similarity index 99% rename from php8/8.2.27/build/php/extensions/install.sh rename to php8/8.3.20/build/php/extensions/install.sh index 464c600b3..45d65e3db 100644 --- a/php8/8.2.27/build/php/extensions/install.sh +++ b/php8/8.3.20/build/php/extensions/install.sh @@ -396,7 +396,7 @@ fi if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then echo "---------- Install imagick ----------" apk add --no-cache file-dev - apk add --no-cache imagemagick imagemagick-dev + apk add --no-cache imagemagick imagemagick-dev imagemagick-pdf # cd imagick-3.7.0 && phpize && ./configure # make # make install diff --git a/php8/8.3.16/build/php/extensions/mongodb-1.15.2.tgz b/php8/8.3.20/build/php/extensions/mongodb-1.15.2.tgz similarity index 100% rename from php8/8.3.16/build/php/extensions/mongodb-1.15.2.tgz rename to php8/8.3.20/build/php/extensions/mongodb-1.15.2.tgz diff --git a/php8/8.3.16/build/php/extensions/redis-6.0.2.tgz b/php8/8.3.20/build/php/extensions/redis-6.0.2.tgz similarity index 100% rename from php8/8.3.16/build/php/extensions/redis-6.0.2.tgz rename to php8/8.3.20/build/php/extensions/redis-6.0.2.tgz diff --git a/php8/8.3.16/build/php/extensions/swoole-5.0.2.tgz b/php8/8.3.20/build/php/extensions/swoole-5.0.2.tgz similarity index 100% rename from php8/8.3.16/build/php/extensions/swoole-5.0.2.tgz rename to php8/8.3.20/build/php/extensions/swoole-5.0.2.tgz diff --git a/php8/8.3.16/build/php/extensions/xdebug-3.2.0.tgz b/php8/8.3.20/build/php/extensions/xdebug-3.2.0.tgz similarity index 100% rename from php8/8.3.16/build/php/extensions/xdebug-3.2.0.tgz rename to php8/8.3.20/build/php/extensions/xdebug-3.2.0.tgz diff --git a/php8/8.3.16/build/php/php-fpm.conf b/php8/8.3.20/build/php/php-fpm.conf similarity index 100% rename from php8/8.3.16/build/php/php-fpm.conf rename to php8/8.3.20/build/php/php-fpm.conf diff --git a/php8/8.3.16/build/php/php.ini b/php8/8.3.20/build/php/php.ini similarity index 100% rename from php8/8.3.16/build/php/php.ini rename to php8/8.3.20/build/php/php.ini diff --git a/php8/8.3.16/conf/php-fpm.conf b/php8/8.3.20/conf/php-fpm.conf similarity index 100% rename from php8/8.3.16/conf/php-fpm.conf rename to php8/8.3.20/conf/php-fpm.conf diff --git a/php8/8.3.16/conf/php.ini b/php8/8.3.20/conf/php.ini similarity index 100% rename from php8/8.3.16/conf/php.ini rename to php8/8.3.20/conf/php.ini diff --git a/php8/8.3.16/data.yml b/php8/8.3.20/data.yml similarity index 100% rename from php8/8.3.16/data.yml rename to php8/8.3.20/data.yml diff --git a/php8/8.3.16/docker-compose.yml b/php8/8.3.20/docker-compose.yml similarity index 100% rename from php8/8.3.16/docker-compose.yml rename to php8/8.3.20/docker-compose.yml diff --git a/php8/8.4.3/build/php/extensions/imagick-3.7.0.tgz b/php8/8.4.3/build/php/extensions/imagick-3.7.0.tgz deleted file mode 100644 index 80d674cda..000000000 Binary files a/php8/8.4.3/build/php/extensions/imagick-3.7.0.tgz and /dev/null differ diff --git a/php8/8.4.3/build/.env b/php8/8.4.6/build/.env similarity index 82% rename from php8/8.4.3/build/.env rename to php8/8.4.6/build/.env index 159d9ced6..5e641e3ce 100644 --- a/php8/8.4.3/build/.env +++ b/php8/8.4.6/build/.env @@ -1,6 +1,6 @@ CONTAINER_PACKAGE_URL=mirrors.ustc.edu.cn -PHP_VERSION=8.4.3 +PHP_VERSION=8.4.6 PHP_PHP_CONF_FILE=./php/php.ini PHP_FPM_CONF_FILE=./php/php-fpm.conf PHP_LOG_DIR=./logs/php @@ -10,5 +10,5 @@ SOURCE_DIR=./www TZ=Asia/Shanghai DATA_DIR=./data -IMAGE_NAME=1panel-php:8.4.3 +IMAGE_NAME=1panel-php:8.4.6 INSTALL_SUPERVISOR=0 \ No newline at end of file diff --git a/php8/8.4.3/build/config.json b/php8/8.4.6/build/config.json similarity index 100% rename from php8/8.4.3/build/config.json rename to php8/8.4.6/build/config.json diff --git a/php8/8.4.3/build/docker-compose.yml b/php8/8.4.6/build/docker-compose.yml similarity index 100% rename from php8/8.4.3/build/docker-compose.yml rename to php8/8.4.6/build/docker-compose.yml diff --git a/php8/8.4.3/build/php/Dockerfile b/php8/8.4.6/build/php/Dockerfile similarity index 100% rename from php8/8.4.3/build/php/Dockerfile rename to php8/8.4.6/build/php/Dockerfile diff --git a/php8/8.4.3/build/php/extensions/event-3.0.8.tgz b/php8/8.4.6/build/php/extensions/event-3.0.8.tgz similarity index 100% rename from php8/8.4.3/build/php/extensions/event-3.0.8.tgz rename to php8/8.4.6/build/php/extensions/event-3.0.8.tgz diff --git a/php8/8.4.3/build/php/extensions/install-composer.sh b/php8/8.4.6/build/php/extensions/install-composer.sh similarity index 100% rename from php8/8.4.3/build/php/extensions/install-composer.sh rename to php8/8.4.6/build/php/extensions/install-composer.sh diff --git a/php8/8.4.3/build/php/extensions/install-php-extensions b/php8/8.4.6/build/php/extensions/install-php-extensions similarity index 99% rename from php8/8.4.3/build/php/extensions/install-php-extensions rename to php8/8.4.6/build/php/extensions/install-php-extensions index 2ef98bb85..ffe08e487 100644 --- a/php8/8.4.3/build/php/extensions/install-php-extensions +++ b/php8/8.4.6/build/php/extensions/install-php-extensions @@ -21,7 +21,7 @@ if ! which docker-php-ext-configure >/dev/null || ! which docker-php-ext-enable exit 1 fi -IPE_VERSION=2.7.27 +IPE_VERSION=2.7.31 StandWithUkraine() { if test -t 1 && ! grep -Eq '^VERSION=.*jessie' /etc/os-release; then @@ -273,15 +273,6 @@ EOT # Nothing processPHPModuleArgument() { processPHPModuleArgument_arg="$1" - case "$processPHPModuleArgument_arg" in - imagick) - if test $PHP_MAJMIN_VERSION -ge 804; then - processPHPModuleArgument_arg=imagick/imagick@65e27f2bc02e7e8f1bf64e26e359e42a1331fca1 - elif test $PHP_MAJMIN_VERSION -ge 803; then - processPHPModuleArgument_arg=imagick/imagick@28f27044e435a2b203e32675e942eb8de620ee58 - fi - ;; - esac # Convert GitHub short form to long url, # for example: from # php-memcached-dev/php-memcached@8f106564e6bb005ca6100b12ccc89000daafa9d8 @@ -2546,10 +2537,12 @@ actuallyInstallComposer() { # Install ionCube Loader installIonCubeLoader() { installIonCubeLoader_version='' - if test $PHP_MAJMIN_VERSION -lt 804; then - # For 14.4.0 we have a Segmentation Fault - installIonCubeLoader_version=14.0.0 - fi + case "$DISTRO" in + alpine) + # For 14.4.0 we have a Segmentation Fault + installIonCubeLoader_version=14.0.0 + ;; + esac installIonCubeLoader_versionForUrl='' installIonCubeLoader_versionForMessage=latest if test -n "$installIonCubeLoader_version"; then @@ -3252,9 +3245,9 @@ installRemoteModule() { geos) if test -z "$installRemoteModule_path"; then if test -z "$installRemoteModule_version"; then - installRemoteModule_version=0def35611f773c951432f1f06a155471a5cb7611 + installRemoteModule_version=dfe1ab17b0f155cc315bc13c75689371676e02e1 fi - installRemoteModule_src="$(getPackageSource https://git.osgeo.org/gitea/geos/php-geos/archive/$installRemoteModule_version.tar.gz)" + installRemoteModule_src="$(getPackageSource https://github.com/libgeos/php-geos/archive/$installRemoteModule_version.tar.gz)" cd "$installRemoteModule_src" ./autogen.sh ./configure @@ -3337,6 +3330,13 @@ installRemoteModule() { # Include SSL Support addConfigureOption with-imap-ssl yes ;; + imagick) + if test -z "$installRemoteModule_version"; then + if test $PHP_MAJMIN_VERSION -lt 506; then + installRemoteModule_version=3.7.0 + fi + fi + ;; inotify) if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 506; then @@ -4409,6 +4409,8 @@ installRemoteModule() { if test -z "$installRemoteModule_version"; then if test $PHP_MAJMIN_VERSION -le 703; then installRemoteModule_version=2.2.3 + elif test $PHP_MAJMIN_VERSION -le 704; then + installRemoteModule_version=3.0.5 fi fi case "$DISTRO" in diff --git a/php8/8.4.3/build/php/extensions/install.sh b/php8/8.4.6/build/php/extensions/install.sh similarity index 99% rename from php8/8.4.3/build/php/extensions/install.sh rename to php8/8.4.6/build/php/extensions/install.sh index 3681a07d4..f46918606 100644 --- a/php8/8.4.3/build/php/extensions/install.sh +++ b/php8/8.4.6/build/php/extensions/install.sh @@ -138,6 +138,11 @@ if [[ -z "${EXTENSIONS##*,redis,*}" ]]; then echo "---------- Install redis ----------" install-php-extensions redis fi + +if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then + echo "---------- Install imagick ----------" + install-php-extensions imagick +fi # end @@ -397,16 +402,6 @@ if [[ -z "${EXTENSIONS##*,psr,*}" ]]; then docker-php-ext-enable psr fi -if [[ -z "${EXTENSIONS##*,imagick,*}" ]]; then - echo "---------- Install imagick ----------" - apk add --no-cache file-dev - apk add --no-cache imagemagick imagemagick-dev -# cd imagick-3.7.0 && phpize && ./configure -# make -# make install - installExtensionFromTgz imagick-3.7.0 -fi - if [[ -z "${EXTENSIONS##*,rar,*}" ]]; then echo "---------- Install rar ----------" printf "\n" | pecl install rar diff --git a/php8/8.4.3/build/php/extensions/mongodb-1.15.2.tgz b/php8/8.4.6/build/php/extensions/mongodb-1.15.2.tgz similarity index 100% rename from php8/8.4.3/build/php/extensions/mongodb-1.15.2.tgz rename to php8/8.4.6/build/php/extensions/mongodb-1.15.2.tgz diff --git a/php8/8.4.3/build/php/extensions/redis-6.0.2.tgz b/php8/8.4.6/build/php/extensions/redis-6.0.2.tgz similarity index 100% rename from php8/8.4.3/build/php/extensions/redis-6.0.2.tgz rename to php8/8.4.6/build/php/extensions/redis-6.0.2.tgz diff --git a/php8/8.4.3/build/php/extensions/swoole-5.0.2.tgz b/php8/8.4.6/build/php/extensions/swoole-5.0.2.tgz similarity index 100% rename from php8/8.4.3/build/php/extensions/swoole-5.0.2.tgz rename to php8/8.4.6/build/php/extensions/swoole-5.0.2.tgz diff --git a/php8/8.4.3/build/php/extensions/xdebug-3.2.0.tgz b/php8/8.4.6/build/php/extensions/xdebug-3.2.0.tgz similarity index 100% rename from php8/8.4.3/build/php/extensions/xdebug-3.2.0.tgz rename to php8/8.4.6/build/php/extensions/xdebug-3.2.0.tgz diff --git a/php8/8.4.3/build/php/php-fpm.conf b/php8/8.4.6/build/php/php-fpm.conf similarity index 100% rename from php8/8.4.3/build/php/php-fpm.conf rename to php8/8.4.6/build/php/php-fpm.conf diff --git a/php8/8.4.3/build/php/php.ini b/php8/8.4.6/build/php/php.ini similarity index 100% rename from php8/8.4.3/build/php/php.ini rename to php8/8.4.6/build/php/php.ini diff --git a/php8/8.4.3/conf/php-fpm.conf b/php8/8.4.6/conf/php-fpm.conf similarity index 100% rename from php8/8.4.3/conf/php-fpm.conf rename to php8/8.4.6/conf/php-fpm.conf diff --git a/php8/8.4.3/conf/php.ini b/php8/8.4.6/conf/php.ini similarity index 100% rename from php8/8.4.3/conf/php.ini rename to php8/8.4.6/conf/php.ini diff --git a/php8/8.4.3/data.yml b/php8/8.4.6/data.yml similarity index 100% rename from php8/8.4.3/data.yml rename to php8/8.4.6/data.yml diff --git a/php8/8.4.3/docker-compose.yml b/php8/8.4.6/docker-compose.yml similarity index 100% rename from php8/8.4.3/docker-compose.yml rename to php8/8.4.6/docker-compose.yml