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

feat(swoole extension): change installation to be able to use PHP 8.0 

Add support for PHP 8.0
Fix other versions of PHP with correct versions.

Closes #2879
This commit is contained in:
Pavel Savushkin 2021-03-14 17:50:14 +02:00
parent ac52c18728
commit f9edf13d65
No known key found for this signature in database
GPG Key ID: BD2EDA3E125300DD
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
php-fpm/Dockerfile
View File

@ -285,16 +285,19 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
########################################################################### ###########################################################################
ARG INSTALL_SWOOLE=false ARG INSTALL_SWOOLE=false
RUN if [ ${INSTALL_SWOOLE} = true ]; then \ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension # Install Php Swoole Extension
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl install swoole-2.0.10; \ pecl -q install swoole-2.0.11; \
else \ else \
if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
pecl install swoole-2.2.0; \ echo '' | pecl install swoole-4.3.5; \
else \ else \
pecl install swoole; \ if [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
echo '' | pecl install swoole-4.6.0; \
else \
echo '' | pecl install swoole; \
fi \
fi \ fi \
fi && \ fi && \
docker-php-ext-enable swoole \ docker-php-ext-enable swoole \

10
workspace/Dockerfile
View File

@ -572,12 +572,16 @@ ARG INSTALL_SWOOLE=false
RUN if [ ${INSTALL_SWOOLE} = true ]; then \ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension # Install Php Swoole Extension
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
pecl -q install swoole-2.0.10; \ pecl -q install swoole-2.0.11; \
else \ else \
if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \ if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
pecl install swoole-2.2.0; \ echo '' | pecl install swoole-4.3.5; \
else \ else \
pecl install swoole; \ if [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
echo '' | pecl install swoole-4.6.0; \
else \
echo '' | pecl install swoole; \
fi \
fi \ fi \
fi && \ fi && \
echo "extension=swoole.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/swoole.ini && \ echo "extension=swoole.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/swoole.ini && \