diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 5b7d43fb..f58acd80 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -236,6 +236,7 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ \ diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index 1643b4b4..91bdc010 100644 --- a/Dockerfiles/mods/Dockerfile-7.3 +++ b/Dockerfiles/mods/Dockerfile-7.3 @@ -68,6 +68,8 @@ ENV BUILD_DEPS \ libsodium-dev \ libnghttp2-dev \ libssl-dev \ + libhiredis-dev \ + cmake \ libtidy-dev \ libxml2-dev \ libxml2-dev \ @@ -101,6 +103,7 @@ ENV RUN_DEPS \ librecode0 \ snmp \ libnghttp2-14 \ + libhiredis0.13 \ libtidy5 \ libxslt1.1 \ libzip4 \ @@ -157,7 +160,7 @@ RUN set -x \ && git clone -v https://github.com/php-memcached-dev/php-memcached /tmp/memcached \ && cd /tmp/memcached \ && git checkout master \ - && phpize && ./configure --enable-memcached && make && make install \ + && phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install \ && docker-php-ext-enable memcached \ && cd / && rm -rf /tmp/memcached \ && pecl install mongodb \ @@ -192,8 +195,44 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sodium \ - && pecl install swoole \ + && git clone -v https://github.com/swoole/swoole-src /tmp/swoole \ + && cd /tmp/swoole \ + && git checkout master \ + && git submodule update --init --recursive \ +&& cd thirdparty/hiredis \ +&& make -j$(getconf _NPROCESSORS_ONLN) \ +&& make install \ +&& cd ../nghttp2 \ +&& cmake . \ +&& make install \ +&& ldconfig \ +&& cd ../.. \ +&& phpize \ +&& ./configure \ + --enable-async-redis \ + --enable-openssl \ + --enable-thread \ + --enable-swoole \ + --enable-swoole-static \ + --with-swoole \ + --with-openssl-dir=/usr \ + --enable-mysqlnd \ + --enable-coroutine \ + --enable-picohttpparser \ + --enable-timewheel \ + #`--enable-hugepage` \ + #`--enable-asan` \ + #`--with-phpx-dir=` \ + #`--with-jemalloc-dir=/usr/include/jemalloc` \ + #`--enable-coroutine-postgresql` \ + #`--enable-http2` \ + #`--enable-sockets` \ + #`--with-libpq-dir=/usr/include/postgresql/libpq/` \ +&& make -j$(getconf _NPROCESSORS_ONLN) \ +&& make install \ + \ && docker-php-ext-enable swoole \ + && cd / && rm -rf /tmp/swoole \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \ @@ -216,6 +255,7 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \ + && /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \ \ \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index a12d13f7..33db24dd 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -718,7 +718,7 @@ extensions_available: type: git git_url: https://github.com/php-memcached-dev/php-memcached git_ref: master - command: phpize && ./configure --enable-memcached && make && make install + command: phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install all: type: pecl build_dep: [zlib1g-dev, libmemcached-dev] @@ -930,8 +930,44 @@ extensions_available: type: pecl run_dep: [libnghttp2-14] 7.3: - type: pecl - run_dep: [libnghttp2-14] + type: git + git_url: https://github.com/swoole/swoole-src + git_ref: master + command: | + git submodule update --init --recursive \ + && cd thirdparty/hiredis \ + && make -j$(getconf _NPROCESSORS_ONLN) \ + && make install \ + && cd ../nghttp2 \ + && cmake . \ + && make install \ + && ldconfig \ + && cd ../.. \ + && phpize \ + && ./configure \ + --enable-async-redis \ + --enable-openssl \ + --enable-thread \ + --enable-swoole \ + --enable-swoole-static \ + --with-swoole \ + --with-openssl-dir=/usr \ + --enable-mysqlnd \ + --enable-coroutine \ + --enable-picohttpparser \ + --enable-timewheel \ + #`--enable-hugepage` \ + #`--enable-asan` \ + #`--with-phpx-dir=` \ + #`--with-jemalloc-dir=/usr/include/jemalloc` \ + #`--enable-coroutine-postgresql` \ + #`--enable-http2` \ + #`--enable-sockets` \ + #`--with-libpq-dir=/usr/include/postgresql/libpq/` \ + && make -j$(getconf _NPROCESSORS_ONLN) \ + && make install \ + run_dep: [libnghttp2-14, libhiredis0.13] + build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, cmake] all: type: pecl build_dep: [libnghttp2-dev, libssl-dev] @@ -1043,9 +1079,11 @@ extensions_available: run_dep: [] 7.2: type: builtin + configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip run_dep: [libzip4] 7.3: type: builtin + configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip run_dep: [libzip4] all: type: builtin