From 36ef04c0f6cc83d635c7e785ba8eb5ed6786f1dc Mon Sep 17 00:00:00 2001
From: Adriaan Wind <adriaan@windfactory.net>
Date: Tue, 15 Jun 2021 17:22:58 +0200
Subject: [PATCH] add swoole the correct way

---
 Dockerfiles/mods/Dockerfile-8.0       | 15 +++++++++++++++
 build/ansible/group_vars/all/mods.yml |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0
index 301a13fb..245fa145 100644
--- a/Dockerfiles/mods/Dockerfile-8.0
+++ b/Dockerfiles/mods/Dockerfile-8.0
@@ -28,6 +28,7 @@ RUN set -eux \
 		libldap2-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
+		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
 		libpq-dev \
@@ -537,6 +538,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& yes yes | pecl install swoole \
+	# Enabling
+	&& docker-php-ext-enable swoole \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sysvmsg --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -689,6 +701,7 @@ RUN set -eux \
 	libjpeg62-turbo \
 	libmcrypt4 \
 	libmemcachedutil2 \
+	libnghttp2-14 \
 	libpng16-16 \
 	libpq5 \
 	libsybdb5 \
@@ -868,6 +881,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \
diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml
index 13c71834..543b10d9 100644
--- a/build/ansible/group_vars/all/mods.yml
+++ b/build/ansible/group_vars/all/mods.yml
@@ -987,7 +987,7 @@ extensions_available:
       build_dep: [libssh2-1-dev]
       run_dep: [libssh2-1]
   swoole:
-    disabled: [5.2, 8.0, 8.1]
+    disabled: [5.2, 8.1]
     5.3:
       type: pecl
       version: 1.9.23