Merge pull request #2914 from laradock/bestlong-fix-typo

fix(swoole extension) | workspace

#2910 
#2915
This commit is contained in:
Shao Yu-Lung (Allen) 2021-03-23 07:56:36 +08:00 committed by GitHub
commit 44c526bcb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -547,7 +547,8 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
ARG INSTALL_SWOOLE=false ARG INSTALL_SWOOLE=false
RUN if [ ${INSTALL_SWOOLE} = true ]; then \ RUN set -eux; \
if [ ${INSTALL_SWOOLE} = true ]; then \
# Install Php Swoole Extension # Install Php Swoole Extension
if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \ if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \
pecl install swoole-2.0.10; \ pecl install swoole-2.0.10; \
@ -558,11 +559,10 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
else \ else \
pecl install swoole; \ pecl install swoole; \
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 && \ ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/swoole.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-swoole.ini; \
ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/swoole.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-swoole.ini \ php -m | grep -q 'swoole'; \
&& php -m | grep -q 'swoole' \ fi
;fi
########################################################################### ###########################################################################
# Taint EXTENSION # Taint EXTENSION