Fix build of phalcon

devilbox · Nov 19, 2022 · d57565e · d57565e
1 parent 28b8906
commit d57565e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2
@@ -807,10 +807,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
+	# Default:      Pecl command
+	&& pecl install swoole-4.8.12 \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true

diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3
@@ -797,10 +797,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
+	# Default:      Pecl command
+	&& pecl install swoole-4.8.12 \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true

diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4
@@ -783,10 +783,10 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
-	# Custom:       Pecl command
-	&& pecl install -D 'enable-sockets="no" enable-openssl="yes" enable-http2="yes" enable-mysqlnd="yes" enable-swoole-json="no" enable-swoole-curl="yes" enable-cares="yes" with-postgres="yes"' swoole \
+	# Default:      Pecl command
+	&& pecl install swoole-4.8.12 \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true

diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml
@@ -1179,6 +1179,15 @@ extensions_available:
     7.1:
       type: pecl
       version: 4.4.26
+    7.2:
+      type: pecl
+      version: 4.8.12
+    7.3:
+      type: pecl
+      version: 4.8.12
+    7.4:
+      type: pecl
+      version: 4.8.12
     all:
       type: pecl
       # Note: -D is only supported from PHP 7.2+