ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3297 from ljgade/master 

fix php7 swoole build failed
This commit is contained in:
Shao Yu-Lung (Allen) 2022-12-11 01:25:47 +08:00 committed by GitHub
parent 24aedbc852 faa8e04632
commit 1df09d5fd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
php-fpm/Dockerfile
View File

@ -322,6 +322,8 @@ RUN set -eux; \
pecl install swoole-4.3.5; \ pecl install swoole-4.3.5; \
elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \
pecl install swoole-4.5.11; \ pecl install swoole-4.5.11; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
pecl install swoole-4.8.12; \
else \ else \
pecl install swoole; \ pecl install swoole; \
fi; \ fi; \

2
php-worker/Dockerfile
View File

@ -355,6 +355,8 @@ RUN set -eux; \
pecl install swoole-4.3.5; \ pecl install swoole-4.3.5; \
elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \ elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \
pecl install swoole-4.5.11; \ pecl install swoole-4.5.11; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
pecl install swoole-4.8.12; \
else \ else \
pecl install swoole; \ pecl install swoole; \
fi; \ fi; \

2
workspace/Dockerfile
View File

@ -551,6 +551,8 @@ RUN set -eux; \
echo '' | pecl -q install swoole-4.3.5; \ echo '' | pecl -q install swoole-4.3.5; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \ elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
echo '' | pecl -q install swoole-4.5.11; \ echo '' | pecl -q install swoole-4.5.11; \
elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
echo '' | pecl -q install swoole-4.8.12; \
else \ else \
echo '' | pecl -q install swoole; \ echo '' | pecl -q install swoole; \
fi; \ fi; \