From 4de394ee880c7e31e54e315fc27a25574027d3ca Mon Sep 17 00:00:00 2001 From: cytopia Date: Thu, 27 Sep 2018 09:48:14 +0200 Subject: [PATCH] Fixes #385 Adding rdkafka-enabled PHP container --- .devilbox/www/config.php | 2 +- README.md | 2 +- docker-compose.yml | 2 +- docs/configuration-files/env-file.rst | 10 +++++----- env-example | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php index 2f29812f..1997d0b4 100644 --- a/.devilbox/www/config.php +++ b/.devilbox/www/config.php @@ -14,7 +14,7 @@ putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1'); $DEVILBOX_VERSION = 'v0.15'; -$DEVILBOX_DATE = '2018-09-14'; +$DEVILBOX_DATE = '2018-09-27'; $DEVILBOX_API_PAGE = 'devilbox-api/status.json'; // diff --git a/README.md b/README.md index 679753ef..1b9a5c65 100644 --- a/README.md +++ b/README.md @@ -570,7 +570,7 @@ Well-known and popular tools will be at your service as well: The Devilbox is a development stack, so it is made sure that a lot of PHP modules are available out of the box in order to work with many different frameworks. -> *amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib* +> *amqp, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, 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, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib* PHP modules can be enabled or disabled on demand to reflect the state of your target environment. diff --git a/docker-compose.yml b/docker-compose.yml index 2a6ef0ee..a135b8a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -95,7 +95,7 @@ services: # PHP / HHVM # ------------------------------------------------------------ php: - image: devilbox/php-fpm:${PHP_SERVER:-7.0}-work-0.39 + image: devilbox/php-fpm:${PHP_SERVER:-7.0}-work-0.40 ## ## All .env variables diff --git a/docs/configuration-files/env-file.rst b/docs/configuration-files/env-file.rst index 84a96583..90c9ae59 100644 --- a/docs/configuration-files/env-file.rst +++ b/docs/configuration-files/env-file.rst @@ -1200,11 +1200,11 @@ PHP_MODULES_DISABLE Disable any PHP modules in a comma separated list. -+-------------------------+--------------------------------------+------------------+ -| Name | Allowed values | Default value | -+=========================+======================================+==================+ -| ``PHP_MODULES_DISABLE`` | comma separated list of module names | ``swoole`` | -+-------------------------+--------------------------------------+------------------+ ++-------------------------+--------------------------------------+--------------------+ +| Name | Allowed values | Default value | ++=========================+======================================+====================+ +| ``PHP_MODULES_DISABLE`` | comma separated list of module names | ``rdkafka,swoole`` | ++-------------------------+--------------------------------------+--------------------+ Example: diff --git a/env-example b/env-example index 0a238bf0..e6de819b 100644 --- a/env-example +++ b/env-example @@ -454,7 +454,7 @@ PHP_MODULES_ENABLE= ### ### PHP_MODULES_DISABLE=xdebug,imagick,swoole ### -PHP_MODULES_DISABLE=swoole +PHP_MODULES_DISABLE=rdkafka,swoole ###