From 62cc38d4afb23a8d2552231f43a2f9af61e7691c Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 10 Nov 2018 21:05:14 +0100 Subject: [PATCH] Fix PHP 5.3 autoconf --- Dockerfiles/mods/Dockerfile-5.3 | 41 +++++++++++++++++++++++++++++++- README.md | 2 +- build/ansible/group_vars/all.yml | 27 +++++++++++++++------ 3 files changed, 61 insertions(+), 9 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-5.3 b/Dockerfiles/mods/Dockerfile-5.3 index 8cbcec83..65fe99d2 100644 --- a/Dockerfiles/mods/Dockerfile-5.3 +++ b/Dockerfiles/mods/Dockerfile-5.3 @@ -32,8 +32,10 @@ ENV BUILD_DEPS \ libjpeg-dev \ libkrb5-dev \ libldap2-dev \ + libmagickwand-dev \ libmcrypt-dev \ libmemcached-dev \ + libnghttp2-dev \ libpng-dev \ libpq-dev \ libpspell-dev \ @@ -60,9 +62,11 @@ ENV RUN_DEPS \ libfreetype6 \ libicu52 \ libjpeg62-turbo \ + libmagickwand-6.q16-2 \ libmcrypt4 \ libmemcachedutil2 \ libmysqlclient18 \ + libnghttp2-5 \ libpng12-0 \ libpq5 \ librabbitmq1 \ @@ -168,11 +172,17 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/doc/gmp || true) \ \ # ---- Installing PHP Extension: igbinary ---- - && pecl install igbinary-2.0.7 \ + && pecl install igbinary \ && docker-php-ext-enable igbinary \ && (rm -rf /usr/local/lib/php/test/igbinary || true) \ && (rm -rf /usr/local/lib/php/doc/igbinary || true) \ \ +# ---- Installing PHP Extension: imagick ---- + && pecl install imagick-3.3.0 \ + && docker-php-ext-enable imagick \ + && (rm -rf /usr/local/lib/php/test/imagick || true) \ + && (rm -rf /usr/local/lib/php/doc/imagick || true) \ + \ # ---- Installing PHP Extension: imap ---- && ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \ && /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \ @@ -225,6 +235,12 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/mongo || true) \ && (rm -rf /usr/local/lib/php/doc/mongo || true) \ \ +# ---- Installing PHP Extension: mongodb ---- + && pecl install mongodb-0.6.3 \ + && docker-php-ext-enable mongodb \ + && (rm -rf /usr/local/lib/php/test/mongodb || true) \ + && (rm -rf /usr/local/lib/php/doc/mongodb || true) \ + \ # ---- Installing PHP Extension: msgpack ---- && pecl install msgpack-0.5.7 \ && docker-php-ext-enable msgpack \ @@ -274,6 +290,15 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/pgsql || true) \ && (rm -rf /usr/local/lib/php/doc/pgsql || true) \ \ +# ---- Installing PHP Extension: phalcon ---- + && git clone https://github.com/phalcon/cphalcon /tmp/phalcon \ + && cd /tmp/phalcon \ + && git checkout phalcon-v2.0.9 \ + && cd build && ./install >/dev/null \ + && docker-php-ext-enable phalcon \ + && (rm -rf /usr/local/lib/php/test/phalcon || true) \ + && (rm -rf /usr/local/lib/php/doc/phalcon || true) \ + \ # ---- Installing PHP Extension: pspell ---- && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \ && (rm -rf /usr/local/lib/php/test/pspell || true) \ @@ -313,6 +338,12 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/sockets || true) \ && (rm -rf /usr/local/lib/php/doc/sockets || true) \ \ +# ---- Installing PHP Extension: swoole ---- + && pecl install swoole-1.9.23 \ + && docker-php-ext-enable swoole \ + && (rm -rf /usr/local/lib/php/test/swoole || true) \ + && (rm -rf /usr/local/lib/php/doc/swoole || true) \ + \ # ---- Installing PHP Extension: sysvmsg ---- && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \ && (rm -rf /usr/local/lib/php/test/sysvmsg || true) \ @@ -443,6 +474,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^iconv$' \ && php -m | grep -oiE '^igbinary$' \ && php-fpm -m | grep -oiE '^igbinary$' \ + && php -m | grep -oiE '^imagick$' \ + && php-fpm -m | grep -oiE '^imagick$' \ && php -m | grep -oiE '^imap$' \ && php-fpm -m | grep -oiE '^imap$' \ && php -m | grep -oiE '^interbase$' \ @@ -465,6 +498,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^memcached$' \ && php -m | grep -oiE '^mongo$' \ && php-fpm -m | grep -oiE '^mongo$' \ + && php -m | grep -oiE '^mongodb$' \ + && php-fpm -m | grep -oiE '^mongodb$' \ && php -m | grep -oiE '^msgpack$' \ && php-fpm -m | grep -oiE '^msgpack$' \ && php -m | grep -oiE '^mysql$' \ @@ -495,6 +530,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^pdo_sqlite$' \ && php -m | grep -oiE '^pgsql$' \ && php-fpm -m | grep -oiE '^pgsql$' \ + && php -m | grep -oiE '^phalcon$' \ + && php-fpm -m | grep -oiE '^phalcon$' \ && php -m | grep -oiE '^phar$' \ && php-fpm -m | grep -oiE '^phar$' \ && php -m | grep -oiE '^posix$' \ @@ -519,6 +556,8 @@ RUN set -x \ && php-fpm -m | grep -oiE '^soap$' \ && php -m | grep -oiE '^sockets$' \ && php-fpm -m | grep -oiE '^sockets$' \ + && 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$' \ diff --git a/README.md b/README.md index 07dc8f98..50176b7c 100644 --- a/README.md +++ b/README.md @@ -531,7 +531,7 @@ Check out this table to see which Docker image provides what PHP modules. 5.3 Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysql, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib - amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib + amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib 5.4 diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index 0bbf2fd2..f5f8c08b 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -942,13 +942,14 @@ extensions_available: 5.2: type: pecl version: 2.0.7 - 5.3: - type: pecl - version: 2.0.7 all: type: pecl imagick: - disabled: [5.2, 5.3, 7.4] + disabled: [5.2, 7.4] + 5.3: + type: pecl + version: 3.3.0 + run_dep: [libmagickwand-6.q16-2] 5.4: type: pecl run_dep: [libmagickwand-6.q16-2] @@ -1090,7 +1091,10 @@ extensions_available: command: yes | pecl install mongo build_dep: [libssl-dev, libsasl2-dev] mongodb: - disabled: [5.2, 5.3] + disabled: [5.2] + 5.3: + type: pecl + version: 0.6.3 5.4: type: pecl version: 1.2.11 @@ -1201,7 +1205,12 @@ extensions_available: build_dep: [libpq-dev] run_dep: [libpq5] phalcon: - disabled: [5.2, 5.3, 7.3, 7.4] + disabled: [5.2, 7.3, 7.4] + 5.3: + type: git + git_url: https://github.com/phalcon/cphalcon + git_ref: phalcon-v2.0.9 + command: cd build && ./install >/dev/null 5.4: type: git git_url: https://github.com/phalcon/cphalcon @@ -1311,7 +1320,11 @@ extensions_available: spl: disabled: "{{ php_all_versions }}" # TODO: Did not work swoole: - disabled: [5.2, 5.3] + disabled: [5.2] + 5.3: + type: pecl + version: 1.9.23 + run_dep: [libnghttp2-5] 5.4: type: pecl version: 1.9.23