Skip to content

Commit ce5f208

Browse files
committed
build:8.2.17-swoole5.1
1 parent f6bac36 commit ce5f208

1 file changed

Lines changed: 14 additions & 21 deletions

File tree

extension/install.sh

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo "Work directory : ${PWD}"
99
echo "============================================"
1010
echo
1111

12-
export EXTENSIONS=",gd,bcmath,pdo,mysqli,pdo_mysql,redis,bz2,calendar,opcache,pcntl,sockets,zip,event,"
12+
export EXTENSIONS=",gd,bcmath,pdo,mysqli,pdo_mysql,redis,bz2,calendar,opcache,pcntl,sockets,zip,event,swoole,"
1313

1414
#
1515
# Check if current php version is greater than or equal to
@@ -24,15 +24,14 @@ export EXTENSIONS=",gd,bcmath,pdo,mysqli,pdo_mysql,redis,bz2,calendar,opcache,pc
2424
# Param 2: Specific PHP Minor version
2525
# Return : 1 if greater than or equal to, 0 if less than
2626
#
27-
isPhpVersionGreaterOrEqual()
28-
{
27+
isPhpVersionGreaterOrEqual() {
2928
local PHP_MAJOR_VERSION=$(php -r "echo PHP_MAJOR_VERSION;")
3029
local PHP_MINOR_VERSION=$(php -r "echo PHP_MINOR_VERSION;")
3130

3231
if [[ "$PHP_MAJOR_VERSION" -gt "$1" || "$PHP_MAJOR_VERSION" -eq "$1" && "$PHP_MINOR_VERSION" -ge "$2" ]]; then
33-
return 1;
32+
return 1
3433
else
35-
return 0;
34+
return 0
3635
fi
3736
}
3837
#
@@ -194,13 +193,13 @@ if [[ -z "${EXTENSIONS##*,gd,*}" ]]; then
194193
libpng-dev \
195194
libjpeg-turbo \
196195
libjpeg-turbo-dev \
197-
libwebp-dev \
198-
&& docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp \
199-
&& docker-php-ext-install gd \
200-
&& apk del \
201-
freetype-dev \
202-
libpng-dev \
203-
libjpeg-turbo-dev
196+
libwebp-dev &&
197+
docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp &&
198+
docker-php-ext-install gd &&
199+
apk del \
200+
freetype-dev \
201+
libpng-dev \
202+
libjpeg-turbo-dev
204203
fi
205204

206205
if [[ -z "${EXTENSIONS##*,intl,*}" ]]; then
@@ -542,14 +541,9 @@ if [[ -z "${EXTENSIONS##*,yaf,*}" ]]; then
542541
fi
543542

544543
if [[ -z "${EXTENSIONS##*,swoole,*}" ]]; then
545-
echo "---------- Install swoole ----------"
546-
isPhpVersionGreaterOrEqual 7 0
547-
548-
if [[ "$?" = "1" ]]; then
549-
installExtensionFromTgz swoole-4.6.7
550-
else
551-
installExtensionFromTgz swoole-2.0.11
552-
fi
544+
echo "---------- Install Swoole ----------"
545+
pecl install swoole-5.1.1
546+
docker-php-ext-enable swoole
553547
fi
554548

555549
if [[ -z "${EXTENSIONS##*,zip,*}" ]]; then
@@ -680,4 +674,3 @@ if [ "${PHP_EXTENSIONS}" != "" ]; then
680674
apk del .build-deps &&
681675
docker-php-source delete
682676
fi
683-

0 commit comments

Comments
 (0)