Răsfoiți Sursa

Merge pull request #3073 from bestlong/fix-3072

fix php5.6 php-worker swoole
Shao Yu-Lung (Allen) 3 ani în urmă
părinte
comite
22d8ad6d1b
1 a modificat fișierele cu 16 adăugiri și 14 ștergeri
  1. 16 14
      php-worker/Dockerfile

+ 16 - 14
php-worker/Dockerfile

@@ -25,6 +25,7 @@ RUN apk --update add wget \
   build-base \
   libmcrypt-dev \
   libxml2-dev \
+  linux-headers \
   pcre-dev \
   zlib-dev \
   autoconf \
@@ -350,20 +351,21 @@ RUN if [ ${INSTALL_REDIS} = true ]; then \
 
 ARG INSTALL_SWOOLE=false
 
-RUN if [ ${INSTALL_SWOOLE} = true ]; then \
-  # Install Php Swoole Extension
-  if   [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ]; then \
-  echo '' | pecl -q install swoole-2.0.10; \
-  elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \
-  echo '' | pecl -q install swoole-4.3.5; \
-  elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \
-  echo '' | pecl -q install swoole-4.5.11; \
-  else \
-  echo '' | pecl -q install swoole; \
-  fi; \
-  docker-php-ext-enable swoole \
-  && php -m | grep -q 'swoole' \
-  ;fi
+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; \
+    elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \
+      pecl install swoole-4.3.5; \
+    elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \
+      pecl install swoole-4.5.11; \
+    else \
+      pecl install swoole; \
+    fi; \
+    docker-php-ext-enable swoole; \
+    php -m | grep -oiE '^swoole$'; \
+  fi
 
 ###########################################################################
 # Taint EXTENSION