Merge pull request #1617 from bestlong/php70-swoole-build-failed

Fix php7.0 swoole build failed.

Merge pull request #1617 from bestlong/php70-swoole-build-failed
Fix php7.0 swoole build failed.
21d203da · Shao Yu-Lung (Allen) · GitHub · 33234fd3 · a3cbfd71 · 21d203da
Unverified Commit 21d203da authored Jun 18, 2018 by Shao Yu-Lung (Allen) Committed by GitHub Jun 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

Dockerfile php-fpm/Dockerfile +5 -1

Dockerfile workspace/Dockerfile +5 -1

No files found.
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -139,7 +139,11 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
      pecl install swoole-2.0.11; \
    else \
-      pecl install swoole; \
+      if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
+        pecl install swoole-2.2.0; \
+      else \
+        pecl install swoole; \
+      fi \
    fi && \
    docker-php-ext-enable swoole \
 ;fi

--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -330,7 +330,11 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
      pecl -q install swoole-2.0.11; \
    else \
-      pecl -q install swoole; \
+      if [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
+        pecl install swoole-2.2.0; \
+      else \
+        pecl install swoole; \
+      fi \
    fi && \
    echo "extension=swoole.so" >> /etc/php/${PHP_VERSION}/mods-available/swoole.ini && \
    ln -s /etc/php/${PHP_VERSION}/mods-available/swoole.ini /etc/php/${PHP_VERSION}/cli/conf.d/20-swoole.ini \