From 3f2bccefae510ba46915264e39ae2cba440dd176 Mon Sep 17 00:00:00 2001 From: Chris Harvey Date: Fri, 22 Jan 2021 23:35:14 +0000 Subject: [PATCH 1/2] Force swoole version to 4.5.11 for PHP 7.1 --- containers/php71/Dockerfile | 2 +- containers/workspace/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/php71/Dockerfile b/containers/php71/Dockerfile index 61d6e80..c7b4a56 100644 --- 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 index e7ae3de..0586f4c 100644 --- a/containers/workspace/Dockerfile +++ b/containers/workspace/Dockerfile @@ -164,7 +164,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 && \ From 89de83c68c7cb3f336652485b3a393bb49f95802 Mon Sep 17 00:00:00 2001 From: Chris Harvey Date: Fri, 22 Jan 2021 23:36:20 +0000 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 451a46c..86fbb86 100644 --- 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