diff --git a/CHANGELOG.md b/CHANGELOG.md index e98845e..836113b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Added arm64 support - Added `vips` module for PHP 8.0 - Added `vips` module for PHP 8.1 +- Added `swoole` module for PHP 8.1 #### Changed - Separated nightly jobs diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 0e8707e..33a14cf 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -13,6 +13,7 @@ RUN set -eux \ freetds-dev \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ @@ -523,17 +524,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: swoole -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install swoole-1.9.23 \ - # Enabling - && docker-php-ext-enable swoole \ - && true - - # -------------------- Installing PHP Extension: sysvmsg -------------------- RUN set -eux \ # Installation: Generic @@ -650,6 +640,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install swoole-1.9.23 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -699,6 +700,7 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libenchant1c2a \ libevent-2.0-5 \ @@ -715,6 +717,7 @@ RUN set -eux \ librabbitmq1 \ librdkafka1 \ librecode0 \ + libssl1.0.0 \ libsybdb5 \ libtidy-0.99-0 \ libvpx1 \ @@ -905,8 +908,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sockets$' \ && php -m | grep -oiE '^spl$' \ && php-fpm -m | grep -oiE '^spl$' \ - && 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$' \ @@ -939,6 +940,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index f6d1506..e4196f1 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -13,6 +13,7 @@ RUN set -eux \ freetds-dev \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ @@ -534,17 +535,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: swoole -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install swoole-1.9.23 \ - # Enabling - && docker-php-ext-enable swoole \ - && true - - # -------------------- Installing PHP Extension: sysvmsg -------------------- RUN set -eux \ # Installation: Generic @@ -661,6 +651,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install swoole-1.9.23 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -710,6 +711,7 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libenchant1c2a \ libevent-2.0-5 \ @@ -726,6 +728,7 @@ RUN set -eux \ librabbitmq1 \ librdkafka1 \ librecode0 \ + libssl1.0.0 \ libsybdb5 \ libtidy-0.99-0 \ libvpx1 \ @@ -918,8 +921,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sockets$' \ && php -m | grep -oiE '^spl$' \ && php-fpm -m | grep -oiE '^spl$' \ - && 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$' \ @@ -952,6 +953,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index 868118d..c5f966c 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -14,6 +14,7 @@ RUN set -eux \ ghostscript \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ @@ -572,17 +573,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: swoole -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install swoole-1.9.23 \ - # Enabling - && docker-php-ext-enable swoole \ - && true - - # -------------------- Installing PHP Extension: sysvmsg -------------------- RUN set -eux \ # Installation: Generic @@ -699,6 +689,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install swoole-1.9.23 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -749,6 +750,7 @@ RUN set -eux \ ghostscript \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libenchant1c2a \ libevent-2.0-5 \ @@ -766,6 +768,7 @@ RUN set -eux \ librabbitmq1 \ librdkafka1 \ librecode0 \ + libssl1.0.0 \ libsybdb5 \ libtidy-0.99-0 \ libvpx1 \ @@ -971,8 +974,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sockets$' \ && php -m | grep -oiE '^spl$' \ && php-fpm -m | grep -oiE '^spl$' \ - && 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$' \ @@ -1005,6 +1006,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 7561272..08d7a31 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -14,6 +14,7 @@ RUN set -eux \ ghostscript \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ @@ -592,17 +593,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: swoole -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install swoole-1.9.23 \ - # Enabling - && docker-php-ext-enable swoole \ - && true - - # -------------------- Installing PHP Extension: sysvmsg -------------------- RUN set -eux \ # Installation: Generic @@ -718,6 +708,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install swoole-1.9.23 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -768,6 +769,7 @@ RUN set -eux \ ghostscript \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libenchant1c2a \ libevent-2.0-5 \ @@ -990,8 +992,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sockets$' \ && php -m | grep -oiE '^spl$' \ && php-fpm -m | grep -oiE '^spl$' \ - && 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$' \ @@ -1024,6 +1024,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 3d4612f..a46de75 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -14,6 +14,7 @@ RUN set -eux \ ghostscript \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ @@ -656,17 +657,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: swoole -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install swoole-4.2.13 \ - # Enabling - && docker-php-ext-enable swoole \ - && true - - # -------------------- Installing PHP Extension: sysvmsg -------------------- RUN set -eux \ # Installation: Generic @@ -804,6 +794,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install swoole-4.2.13 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -854,6 +855,7 @@ RUN set -eux \ ghostscript \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libenchant1c2a \ libevent-2.0-5 \ @@ -1081,8 +1083,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sqlsrv$' \ && php -m | grep -oiE '^ssh2$' \ && php-fpm -m | grep -oiE '^ssh2$' \ - && 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$' \ @@ -1119,6 +1119,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index e007908..c6e6768 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -14,6 +14,7 @@ RUN set -eux \ ghostscript \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ @@ -665,17 +666,6 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: swoole -------------------- -RUN set -eux \ - # Installation: Version specific - # Type: PECL extension - # Default: Pecl command - && pecl install swoole-4.4.26 \ - # Enabling - && docker-php-ext-enable swoole \ - && true - - # -------------------- Installing PHP Extension: sysvmsg -------------------- RUN set -eux \ # Installation: Generic @@ -812,6 +802,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Version specific + # Type: PECL extension + # Default: Pecl command + && pecl install swoole-4.4.26 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -862,6 +863,7 @@ RUN set -eux \ ghostscript \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libenchant1c2a \ libevent-2.1-6 \ @@ -1091,8 +1093,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sqlsrv$' \ && php -m | grep -oiE '^ssh2$' \ && php-fpm -m | grep -oiE '^ssh2$' \ - && 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$' \ @@ -1129,6 +1129,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 6c2c6e6..5ce787d 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -14,6 +14,7 @@ RUN set -eux \ ghostscript \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-dev \ @@ -668,17 +669,6 @@ 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 @@ -815,6 +805,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Generic + # 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 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -865,6 +866,7 @@ RUN set -eux \ ghostscript \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libenchant1c2a \ libevent-2.1-6 \ @@ -1096,8 +1098,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sqlsrv$' \ && php -m | grep -oiE '^ssh2$' \ && php-fpm -m | grep -oiE '^ssh2$' \ - && 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$' \ @@ -1134,6 +1134,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index e9b3f46..cd1bc49 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -14,6 +14,7 @@ RUN set -eux \ ghostscript \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libevent-dev \ @@ -658,17 +659,6 @@ 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 @@ -805,6 +795,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Generic + # 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 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -855,6 +856,7 @@ RUN set -eux \ ghostscript \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libevent-2.1-7 \ libfbclient2 \ @@ -1083,8 +1085,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sqlsrv$' \ && php -m | grep -oiE '^ssh2$' \ && php-fpm -m | grep -oiE '^ssh2$' \ - && 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$' \ @@ -1121,6 +1121,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 03c7fcd..f251ecc 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -14,6 +14,7 @@ RUN set -eux \ ghostscript \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libevent-dev \ @@ -652,17 +653,6 @@ 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 @@ -791,6 +781,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Generic + # 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 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -841,6 +842,7 @@ RUN set -eux \ ghostscript \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libevent-2.1-7 \ libfbclient2 \ @@ -1067,8 +1069,6 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sqlsrv$' \ && php -m | grep -oiE '^ssh2$' \ && php-fpm -m | grep -oiE '^ssh2$' \ - && 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$' \ @@ -1103,6 +1103,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-8.0 b/Dockerfiles/mods/Dockerfile-8.0 index c19a05e..b70a456 100644 --- a/Dockerfiles/mods/Dockerfile-8.0 +++ b/Dockerfiles/mods/Dockerfile-8.0 @@ -14,6 +14,7 @@ RUN set -eux \ ghostscript \ libaio-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-2-dev \ @@ -619,17 +620,6 @@ 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 @@ -746,6 +736,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Generic + # 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 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -796,6 +797,7 @@ RUN set -eux \ ghostscript \ libaio1 \ libaspell15 \ + libc-ares2 \ libc-client2007e \ libenchant-2-2 \ libevent-2.1-7 \ @@ -1020,8 +1022,6 @@ 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$' \ @@ -1054,6 +1054,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-8.1 b/Dockerfiles/mods/Dockerfile-8.1 index 22d181e..947bbbd 100644 --- a/Dockerfiles/mods/Dockerfile-8.1 +++ b/Dockerfiles/mods/Dockerfile-8.1 @@ -15,6 +15,7 @@ RUN set -eux \ libaio-dev \ libavif-dev \ libbz2-dev \ + libc-ares-dev \ libc-client-dev \ libcurl4-openssl-dev \ libenchant-2-dev \ @@ -30,6 +31,7 @@ RUN set -eux \ libmagickwand-dev \ libmariadb-dev \ libmemcached-dev \ + libnghttp2-dev \ libpcre3-dev \ libpng-dev \ libpq-dev \ @@ -721,6 +723,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: swoole -------------------- +RUN set -eux \ + # Installation: Generic + # 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 \ + # Enabling + && docker-php-ext-enable swoole \ + && true + + # Fix php.ini settings for enabled extensions @@ -772,6 +785,7 @@ RUN set -eux \ libaio1 \ libaspell15 \ libavif9 \ + libc-ares2 \ libc-client2007e \ libenchant-2-2 \ libevent-2.1-7 \ @@ -783,6 +797,7 @@ RUN set -eux \ libmagickwand-6.q16-6 \ libmariadbd19 \ libmemcachedutil2 \ + libnghttp2-14 \ libpng16-16 \ libpq5 \ librabbitmq4 \ @@ -1024,6 +1039,8 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^yaml$' \ && php -m | grep -oiE '^zip$' \ && php-fpm -m | grep -oiE '^zip$' \ + && php -m | grep -oiE '^swoole$' \ + && php-fpm -m | grep -oiE '^swoole$' \ && true diff --git a/README.md b/README.md index da0c032..b0eb136 100644 --- a/README.md +++ b/README.md @@ -716,7 +716,7 @@ Check out this table to see which Docker image provides what PHP modules. 8.1 Core, ctype, curl, date, dom, FFI, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib + amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, uuid, vips, xdebug, xlswriter, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib 8.2 diff --git a/build/ansible/group_vars/all/mods.yml b/build/ansible/group_vars/all/mods.yml index 231080d..64f71df 100644 --- a/build/ansible/group_vars/all/mods.yml +++ b/build/ansible/group_vars/all/mods.yml @@ -94,8 +94,6 @@ extensions_enabled: - spl - sqlsrv - ssh2 - # requires sockets to be installed - - swoole - sysvmsg - sysvsem - sysvshm @@ -114,6 +112,9 @@ extensions_enabled: - xlswriter - yaml - zip + # Swoole requires php-json, php-sockets, php-curl, php-mysql (and others) to be installed + # https://openswoole.com/docs/get-started/prerequisites#php-extensions + - swoole # ------------------------------------------------------------------------------------------------- @@ -1146,19 +1147,19 @@ extensions_available: build_dep: [libssh2-1-dev] run_dep: [libssh2-1] swoole: - disabled: [5.2, 8.1, 8.2] + disabled: [5.2, 8.2] 5.3: type: pecl version: 1.9.23 - run_dep: [libnghttp2-5] + run_dep: [libc-ares2, libnghttp2-5, libssl1.0.0] 5.4: type: pecl version: 1.9.23 - run_dep: [libnghttp2-5] + run_dep: [libc-ares2, libnghttp2-5, libssl1.0.0] 5.5: type: pecl version: 1.9.23 - run_dep: [libnghttp2-5] + run_dep: [libc-ares2, libnghttp2-5, libssl1.0.0] 5.6: type: pecl version: 1.9.23 @@ -1170,9 +1171,9 @@ extensions_available: version: 4.4.26 all: type: pecl - command: yes yes | pecl install swoole - build_dep: [libnghttp2-dev, libssl-dev] - run_dep: [libnghttp2-14] + 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 + build_dep: [libc-ares-dev, libnghttp2-dev, libssl-dev, libcurl4-openssl-dev] + run_dep: [libc-ares2, libnghttp2-14] sysvmsg: all: type: builtin