Merge branch 'master' into develop

chrisnharvey · Jan 22, 2021 · 9e812a0 · 9e812a0
2 parents 7bc84a3 + 03a5541
commit 9e812a0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased](https://github.com/chrisnharvey/magicLAMP/compare/master...develop)
 
+# v1.5.2
+
+### Fixed
+
+- Swoole version is now forced at 4.5.11 in PHP 7.1
+
 # v.1.5.1
 
 ### Fixed

diff --git a/containers/php71/Dockerfile b/containers/php71/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && \
     docker-php-ext-install -j$(nproc) gd && \
     docker-php-ext-install mysqli pdo pdo_mysql pdo_pgsql zip bcmath && \
     pecl install imagick && \
-    pecl install swoole && \
+    pecl install swoole-4.5.11 && \
     pecl install memcached && \
     docker-php-ext-enable imagick opcache swoole memcached
 

diff --git a/containers/workspace/Dockerfile b/containers/workspace/Dockerfile
@@ -173,7 +173,7 @@ RUN 5.6 pecl install -f swoole-2.0.10 && \
     7.0 pecl install -f swoole-4.3.6 && \
     7.0 pecl uninstall -r swoole && \
     echo "extension=swoole.so" > /etc/php/7.0/cli/conf.d/50-swoole.ini && \
-    7.1 pecl install -f swoole && \
+    7.1 pecl install -f swoole-4.5.11 && \
     7.1 pecl uninstall -r swoole && \
     echo "extension=swoole.so" > /etc/php/7.1/cli/conf.d/50-swoole.ini && \
     7.2 pecl install -f swoole && \