diff --git a/Dockerfiles/mods/Dockerfile-5.2 b/Dockerfiles/mods/Dockerfile-5.2 index 7544f731..36516a9e 100644 --- a/Dockerfiles/mods/Dockerfile-5.2 +++ b/Dockerfiles/mods/Dockerfile-5.2 @@ -286,7 +286,7 @@ RUN set -eux \ # Installation: Version specific # Type: PECL extension # Custom: Pecl command - && yes | pecl install mongo-1.5.8 \ + && yes yes | pecl install mongo-1.5.8 \ # Enabling && docker-php-ext-enable mongo \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index abd6bc89..457dfe5a 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -297,7 +297,7 @@ RUN set -eux \ # Installation: Generic # Type: PECL extension # Custom: Pecl command - && yes | pecl install mongo \ + && yes yes | pecl install mongo \ # Enabling && docker-php-ext-enable mongo \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.4 b/Dockerfiles/mods/Dockerfile-5.4 index 551a4fbe..a2e96880 100644 --- a/Dockerfiles/mods/Dockerfile-5.4 +++ b/Dockerfiles/mods/Dockerfile-5.4 @@ -297,7 +297,7 @@ RUN set -eux \ # Installation: Generic # Type: PECL extension # Custom: Pecl command - && yes | pecl install mongo \ + && yes yes | pecl install mongo \ # Enabling && docker-php-ext-enable mongo \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.5 b/Dockerfiles/mods/Dockerfile-5.5 index e00940fb..ead675ca 100644 --- a/Dockerfiles/mods/Dockerfile-5.5 +++ b/Dockerfiles/mods/Dockerfile-5.5 @@ -280,7 +280,7 @@ RUN set -eux \ # Installation: Generic # Type: PECL extension # Custom: Pecl command - && yes | pecl install mongo \ + && yes yes | pecl install mongo \ # Enabling && docker-php-ext-enable mongo \ && true diff --git a/Dockerfiles/mods/Dockerfile-5.6 b/Dockerfiles/mods/Dockerfile-5.6 index 8ea78801..47b2c3c0 100644 --- a/Dockerfiles/mods/Dockerfile-5.6 +++ b/Dockerfiles/mods/Dockerfile-5.6 @@ -309,7 +309,7 @@ RUN set -eux \ # Installation: Generic # Type: PECL extension # Custom: Pecl command - && yes | pecl install mongo \ + && yes yes | pecl install mongo \ # Enabling && docker-php-ext-enable mongo \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index de49a8ed..09bfe605 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -39,6 +39,7 @@ RUN set -eux \ librecode-dev \ libsasl2-dev \ libsnmp-dev \ + libssh2-1-dev \ libssl-dev \ libtidy-dev \ libvpx-dev \ @@ -574,6 +575,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: ssh2 -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install ssh2-1.2 \ + # Enabling + && docker-php-ext-enable ssh2 \ + && true + + # -------------------- Installing PHP Extension: swoole -------------------- RUN set -eux \ # Installation: Version specific @@ -756,6 +768,7 @@ RUN set -eux \ librabbitmq4 \ librdkafka1 \ librecode0 \ + libssh2-1 \ libsybdb5 \ libtidy5 \ libvpx4 \ @@ -938,6 +951,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 '^ssh2$' \ + && php-fpm -m | grep -oiE '^ssh2$' \ && php -m | grep -oiE '^swoole$' \ && php-fpm -m | grep -oiE '^swoole$' \ && php -m | grep -oiE '^sysvmsg$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 987a3902..a3fee5b8 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -39,6 +39,7 @@ RUN set -eux \ librecode-dev \ libsasl2-dev \ libsnmp-dev \ + libssh2-1-dev \ libssl-dev \ libtidy-dev \ libvpx-dev \ @@ -562,6 +563,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: solr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install solr \ + # Enabling + && docker-php-ext-enable solr \ + && true + + # -------------------- Installing PHP Extension: sqlsrv -------------------- RUN set -eux \ # Installation: Generic @@ -573,12 +585,23 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: swoole -------------------- +# -------------------- Installing PHP Extension: ssh2 -------------------- RUN set -eux \ # Installation: Generic # Type: PECL extension # Default: Pecl command - && pecl install swoole \ + && pecl install ssh2-1.2 \ + # Enabling + && docker-php-ext-enable ssh2 \ + && 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 @@ -754,6 +777,7 @@ RUN set -eux \ librabbitmq4 \ librdkafka1 \ librecode0 \ + libssh2-1 \ libsybdb5 \ libtidy5deb1 \ libvpx5 \ @@ -933,10 +957,14 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^soap$' \ && php -m | grep -oiE '^sockets$' \ && php-fpm -m | grep -oiE '^sockets$' \ + && php -m | grep -oiE '^solr$' \ + && php-fpm -m | grep -oiE '^solr$' \ && php -m | grep -oiE '^spl$' \ && php-fpm -m | grep -oiE '^spl$' \ && php -m | grep -oiE '^sqlsrv$' \ && 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$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 02c35a01..017ffacd 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -39,6 +39,7 @@ RUN set -eux \ librecode-dev \ libsasl2-dev \ libsnmp-dev \ + libssh2-1-dev \ libssl-dev \ libtidy-dev \ libvpx-dev \ @@ -566,6 +567,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: solr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install solr \ + # Enabling + && docker-php-ext-enable solr \ + && true + + # -------------------- Installing PHP Extension: sqlsrv -------------------- RUN set -eux \ # Installation: Generic @@ -577,12 +589,23 @@ RUN set -eux \ && true -# -------------------- Installing PHP Extension: swoole -------------------- +# -------------------- Installing PHP Extension: ssh2 -------------------- RUN set -eux \ # Installation: Generic # Type: PECL extension # Default: Pecl command - && pecl install swoole \ + && pecl install ssh2-1.2 \ + # Enabling + && docker-php-ext-enable ssh2 \ + && 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 @@ -758,6 +781,7 @@ RUN set -eux \ librabbitmq4 \ librdkafka1 \ librecode0 \ + libssh2-1 \ libsybdb5 \ libtidy5deb1 \ libvpx5 \ @@ -939,10 +963,14 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sockets$' \ && php -m | grep -oiE '^sodium$' \ && php-fpm -m | grep -oiE '^sodium$' \ + && php -m | grep -oiE '^solr$' \ + && php-fpm -m | grep -oiE '^solr$' \ && php -m | grep -oiE '^spl$' \ && php-fpm -m | grep -oiE '^spl$' \ && php -m | grep -oiE '^sqlsrv$' \ && 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$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 94cbf31b..87807112 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -10,7 +10,6 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ alien \ - cmake \ firebird-dev \ freetds-dev \ libaio-dev \ @@ -22,7 +21,6 @@ RUN set -eux \ libfbclient2 \ libfreetype6-dev \ libgmp-dev \ - libhiredis-dev \ libib-util \ libicu-dev \ libjpeg-dev \ @@ -41,6 +39,7 @@ RUN set -eux \ librecode-dev \ libsasl2-dev \ libsnmp-dev \ + libssh2-1-dev \ libssl-dev \ libtidy-dev \ libvpx-dev \ @@ -568,6 +567,17 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: solr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install solr \ + # Enabling + && docker-php-ext-enable solr \ + && true + + # -------------------- Installing PHP Extension: sqlsrv -------------------- RUN set -eux \ # Installation: Generic @@ -579,25 +589,23 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: ssh2 -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install ssh2-1.2 \ + # Enabling + && docker-php-ext-enable ssh2 \ + && true + + # -------------------- Installing PHP Extension: swoole -------------------- RUN set -eux \ - # Installation: Version specific - # Type: GIT extension - && git clone https://github.com/swoole/swoole-src /tmp/swoole \ - && cd /tmp/swoole \ - # Custom: Branch - && git checkout $(git describe --abbrev=0 --tags) \ - # Custom: Install command - && phpize \ -&& ./configure \ - --enable-openssl \ - --enable-sockets \ - --enable-http2 \ - --enable-mysqlnd \ - --enable-coroutine-postgresql \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ - \ + # Installation: Generic + # Type: PECL extension + # Custom: Pecl command + && yes yes | pecl install swoole \ # Enabling && docker-php-ext-enable swoole \ && true @@ -762,7 +770,6 @@ RUN set -eux \ libenchant1c2a \ libfbclient2 \ libfreetype6 \ - libhiredis0.14 \ libicu63 \ libjpeg62-turbo \ libmagickwand-6.q16-6 \ @@ -774,6 +781,7 @@ RUN set -eux \ librabbitmq4 \ librdkafka1 \ librecode0 \ + libssh2-1 \ libsybdb5 \ libtidy5deb1 \ libvpx5 \ @@ -955,10 +963,14 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sockets$' \ && php -m | grep -oiE '^sodium$' \ && php-fpm -m | grep -oiE '^sodium$' \ + && php -m | grep -oiE '^solr$' \ + && php-fpm -m | grep -oiE '^solr$' \ && php -m | grep -oiE '^spl$' \ && php-fpm -m | grep -oiE '^spl$' \ && php -m | grep -oiE '^sqlsrv$' \ && 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$' \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index e252e467..38b5090f 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -10,18 +10,17 @@ RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ alien \ - cmake \ firebird-dev \ freetds-dev \ libaio-dev \ libbz2-dev \ + libcurl4-openssl-dev \ libenchant-dev \ libevent-dev \ libfbclient2 \ libffi-dev \ libfreetype6-dev \ libgmp-dev \ - libhiredis-dev \ libib-util \ libicu-dev \ libjpeg-dev \ @@ -38,6 +37,7 @@ RUN set -eux \ librdkafka-dev \ libsasl2-dev \ libsnmp-dev \ + libssh2-1-dev \ libssl-dev \ libtidy-dev \ libvpx-dev \ @@ -537,25 +537,34 @@ RUN set -eux \ && true +# -------------------- Installing PHP Extension: solr -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install solr \ + # Enabling + && docker-php-ext-enable solr \ + && true + + +# -------------------- Installing PHP Extension: ssh2 -------------------- +RUN set -eux \ + # Installation: Generic + # Type: PECL extension + # Default: Pecl command + && pecl install ssh2-1.2 \ + # Enabling + && docker-php-ext-enable ssh2 \ + && true + + # -------------------- Installing PHP Extension: swoole -------------------- RUN set -eux \ - # Installation: Version specific - # Type: GIT extension - && git clone https://github.com/swoole/swoole-src /tmp/swoole \ - && cd /tmp/swoole \ - # Custom: Branch - && git checkout master \ - # Custom: Install command - && phpize \ -&& ./configure \ - --enable-openssl \ - --enable-sockets \ - --enable-http2 \ - --enable-mysqlnd \ - --enable-coroutine-postgresql \ -&& make -j$(getconf _NPROCESSORS_ONLN) \ -&& make install \ - \ + # Installation: Generic + # Type: PECL extension + # Custom: Pecl command + && yes yes | pecl install swoole \ # Enabling && docker-php-ext-enable swoole \ && true @@ -712,7 +721,6 @@ RUN set -eux \ libfbclient2 \ libffi6 \ libfreetype6 \ - libhiredis0.14 \ libicu63 \ libjpeg62-turbo \ libmagickwand-6.q16-6 \ @@ -723,6 +731,7 @@ RUN set -eux \ libpq5 \ librabbitmq4 \ librdkafka1 \ + libssh2-1 \ libsybdb5 \ libtidy5deb1 \ libvpx5 \ @@ -897,8 +906,12 @@ RUN set -eux \ && php-fpm -m | grep -oiE '^sockets$' \ && php -m | grep -oiE '^sodium$' \ && php-fpm -m | grep -oiE '^sodium$' \ + && php -m | grep -oiE '^solr$' \ + && php-fpm -m | grep -oiE '^solr$' \ && php -m | grep -oiE '^spl$' \ && php-fpm -m | grep -oiE '^spl$' \ + && 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$' \ diff --git a/README.md b/README.md index 544b8ac7..820011d4 100644 --- a/README.md +++ b/README.md @@ -627,27 +627,27 @@ Check out this table to see which Docker image provides what PHP modules.