1
0
mirror of https://github.com/pooneyy/1Panel-Appstore.git synced 2026-04-12 18:42:30 +08:00

feat: update php version (#3742)

This commit is contained in:
ChengPlay 2025-04-23 10:43:02 +08:00 committed by GitHub
parent d8f98fe36f
commit 5a514a9530
61 changed files with 105 additions and 100 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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