diff --git a/Dockerfiles/mods/Dockerfile-7.0 b/Dockerfiles/mods/Dockerfile-7.0 index 9c17fec..f8f0a15 100644 --- a/Dockerfiles/mods/Dockerfile-7.0 +++ b/Dockerfiles/mods/Dockerfile-7.0 @@ -75,6 +75,7 @@ ENV BUILD_DEPS \ zlib1g-dev \ libmemcached-dev \ git \ + zlib1g-dev \ ca-certificates ENV RUN_DEPS \ @@ -165,6 +166,7 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ @@ -219,6 +221,12 @@ RUN set -x \ && cd /tmp/uploadprogress && phpize && ./configure --enable-uploadprogress && make -j$(getconf _NPROCESSORS_ONLN) && make install \ && docker-php-ext-enable uploadprogress \ && cd / && rm -rf /tmp/uploadprogress \ + && git clone -v https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ + && cd /tmp/memcache \ + && git checkout NON_BLOCKING_IO_php7 \ + && cd /tmp/memcache && phpize && ./configure --with-zlib-dir=/usr && make -j$(getconf _NPROCESSORS_ONLN) && make install \ + && docker-php-ext-enable memcache \ + && cd / && rm -rf /tmp/memcache \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ @@ -324,6 +332,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^sysvsem$' \ && php -m | grep -oiE '^pspell$' \ && php-fpm -m | grep -oiE '^pspell$' \ + && php -m | grep -oiE '^mysqli$' \ + && php-fpm -m | grep -oiE '^mysqli$' \ && php -m | grep -oiE '^readline$' \ && php-fpm -m | grep -oiE '^readline$' \ && php -m | grep -oiE '^pdo_sqlite$' \ @@ -378,6 +388,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^apcu$' \ && php -m | grep -oiE '^uploadprogress$' \ && php-fpm -m | grep -oiE '^uploadprogress$' \ + && php -m | grep -oiE '^memcache$' \ + && php-fpm -m | grep -oiE '^memcache$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.1 b/Dockerfiles/mods/Dockerfile-7.1 index 37bf9cc..adafcbe 100644 --- a/Dockerfiles/mods/Dockerfile-7.1 +++ b/Dockerfiles/mods/Dockerfile-7.1 @@ -75,6 +75,7 @@ ENV BUILD_DEPS \ zlib1g-dev \ libmemcached-dev \ git \ + zlib1g-dev \ ca-certificates ENV RUN_DEPS \ @@ -165,6 +166,7 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ @@ -219,6 +221,12 @@ RUN set -x \ && cd /tmp/uploadprogress && phpize && ./configure --enable-uploadprogress && make -j$(getconf _NPROCESSORS_ONLN) && make install \ && docker-php-ext-enable uploadprogress \ && cd / && rm -rf /tmp/uploadprogress \ + && git clone -v https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ + && cd /tmp/memcache \ + && git checkout NON_BLOCKING_IO_php7 \ + && cd /tmp/memcache && phpize && ./configure --with-zlib-dir=/usr && make -j$(getconf _NPROCESSORS_ONLN) && make install \ + && docker-php-ext-enable memcache \ + && cd / && rm -rf /tmp/memcache \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ @@ -324,6 +332,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^sysvsem$' \ && php -m | grep -oiE '^pspell$' \ && php-fpm -m | grep -oiE '^pspell$' \ + && php -m | grep -oiE '^mysqli$' \ + && php-fpm -m | grep -oiE '^mysqli$' \ && php -m | grep -oiE '^readline$' \ && php-fpm -m | grep -oiE '^readline$' \ && php -m | grep -oiE '^pdo_sqlite$' \ @@ -378,6 +388,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^apcu$' \ && php -m | grep -oiE '^uploadprogress$' \ && php-fpm -m | grep -oiE '^uploadprogress$' \ + && php -m | grep -oiE '^memcache$' \ + && php-fpm -m | grep -oiE '^memcache$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && true diff --git a/Dockerfiles/mods/Dockerfile-7.2 b/Dockerfiles/mods/Dockerfile-7.2 index 33e93c4..a0ca9e0 100644 --- a/Dockerfiles/mods/Dockerfile-7.2 +++ b/Dockerfiles/mods/Dockerfile-7.2 @@ -76,6 +76,7 @@ ENV BUILD_DEPS \ zlib1g-dev \ libmemcached-dev \ git \ + zlib1g-dev \ ca-certificates ENV RUN_DEPS \ @@ -167,6 +168,7 @@ RUN set -x \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) fileinfo \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ + && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) readline \ && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_sqlite \ && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ @@ -222,6 +224,12 @@ RUN set -x \ && cd /tmp/uploadprogress && phpize && ./configure --enable-uploadprogress && make -j$(getconf _NPROCESSORS_ONLN) && make install \ && docker-php-ext-enable uploadprogress \ && cd / && rm -rf /tmp/uploadprogress \ + && git clone -v https://github.com/websupport-sk/pecl-memcache /tmp/memcache \ + && cd /tmp/memcache \ + && git checkout NON_BLOCKING_IO_php7 \ + && cd /tmp/memcache && phpize && ./configure --with-zlib-dir=/usr && make -j$(getconf _NPROCESSORS_ONLN) && make install \ + && docker-php-ext-enable memcache \ + && cd / && rm -rf /tmp/memcache \ && git clone -v https://github.com/phalcon/cphalcon /tmp/phalcon \ && cd /tmp/phalcon \ && git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g') \ @@ -329,6 +337,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^sysvsem$' \ && php -m | grep -oiE '^pspell$' \ && php-fpm -m | grep -oiE '^pspell$' \ + && php -m | grep -oiE '^mysqli$' \ + && php-fpm -m | grep -oiE '^mysqli$' \ && php -m | grep -oiE '^readline$' \ && php-fpm -m | grep -oiE '^readline$' \ && php -m | grep -oiE '^pdo_sqlite$' \ @@ -383,6 +393,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^apcu$' \ && php -m | grep -oiE '^uploadprogress$' \ && php-fpm -m | grep -oiE '^uploadprogress$' \ + && php -m | grep -oiE '^memcache$' \ + && php-fpm -m | grep -oiE '^memcache$' \ && php -m | grep -oiE '^phalcon$' \ && php-fpm -m | grep -oiE '^phalcon$' \ && true diff --git a/README.md b/README.md index d61106d..1831011 100644 --- a/README.md +++ b/README.md @@ -31,17 +31,17 @@