Bläddra i källkod

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

fix(swoole extension) | workspace

#2910 
#2915
Shao Yu-Lung (Allen) 4 år sedan
förälder
incheckning
44c526bcb6
1 ändrade filer med 6 tillägg och 6 borttagningar
  1. 6 6
      workspace/Dockerfile

+ 6 - 6
workspace/Dockerfile

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