From 599fd786d796542a3cc14866c267d8aa16c0743b Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 12 Jan 2019 16:13:01 +0100 Subject: [PATCH] Remove imap from PHP 7.4 due to build errors --- Dockerfiles/mods/Dockerfile-7.4 | 13 ------------- README.md | 2 +- build/ansible/group_vars/all.yml | 2 ++ 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index 89ac6a29..9c06338c 100644 --- a/Dockerfiles/mods/Dockerfile-7.4 +++ b/Dockerfiles/mods/Dockerfile-7.4 @@ -24,8 +24,6 @@ ENV BUILD_DEPS \ freetds-dev \ libaio-dev \ libbz2-dev \ - libc-client-dev \ - libcurl4-openssl-dev \ libenchant-dev \ libevent-dev \ libfbclient2 \ @@ -36,7 +34,6 @@ ENV BUILD_DEPS \ libib-util \ libicu-dev \ libjpeg-dev \ - libkrb5-dev \ libldap2-dev \ libmemcached-dev \ libnghttp2-dev \ @@ -63,7 +60,6 @@ ENV BUILD_DEPS \ ENV RUN_DEPS \ libaio1 \ libaspell15 \ - libc-client2007e \ libenchant1c2a \ libfbclient2 \ libffi6 \ @@ -166,13 +162,6 @@ RUN set -x \ && (rm -rf /usr/local/lib/php/test/igbinary || true) \ && (rm -rf /usr/local/lib/php/doc/igbinary || 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 \ - && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \ - && (rm -rf /usr/local/lib/php/test/imap || true) \ - && (rm -rf /usr/local/lib/php/doc/imap || true) \ - \ # ---- Installing PHP Extension: interbase ---- && /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \ && (rm -rf /usr/local/lib/php/test/interbase || true) \ @@ -480,8 +469,6 @@ RUN set -x \ && php-fpm -m | grep -oiE '^iconv$' \ && php -m | grep -oiE '^igbinary$' \ && php-fpm -m | grep -oiE '^igbinary$' \ - && php -m | grep -oiE '^imap$' \ - && php-fpm -m | grep -oiE '^imap$' \ && php -m | grep -oiE '^interbase$' \ && php-fpm -m | grep -oiE '^interbase$' \ && php -m | grep -oiE '^intl$' \ diff --git a/README.md b/README.md index d9f765c0..e946eb93 100644 --- a/README.md +++ b/README.md @@ -571,7 +571,7 @@ Check out this table to see which Docker image provides what PHP modules. 7.4 Core, ctype, curl, date, dom, 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 - bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib + bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index ac3dbe7f..1186602d 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -1026,6 +1026,8 @@ extensions_available: build_dep: [libmagickwand-dev] run_dep: [libmagickwand-6.q16-3] imap: + disabled: [7.4] # TODO: re-enable. currently fails with: configure: error: OpenSSL libraries not found. + all: type: builtin pre: ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/