Merge pull request #143 from devilbox/release-0.98

Release v0.98

Dockerfiles/base/Dockerfile-7.4

@@ -1,5 +1,5 @@
 # Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
-FROM devilbox/php-fpm-7.4
+FROM php:7.4-fpm
 MAINTAINER "cytopia" <cytopia@everythingcli.org>
 
 

Dockerfiles/mods/Dockerfile-5.2

@@ -286,7 +286,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo-1.5.8 \
+	&& yes yes | pecl install mongo-1.5.8 \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

Dockerfiles/mods/Dockerfile-5.3

@@ -297,7 +297,7 @@ RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo \
+	&& yes yes | pecl install mongo \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

Dockerfiles/mods/Dockerfile-5.4

@@ -297,7 +297,7 @@ RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo \
+	&& yes yes | pecl install mongo \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

Dockerfiles/mods/Dockerfile-5.5

@@ -280,7 +280,7 @@ RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo \
+	&& yes yes | pecl install mongo \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

Dockerfiles/mods/Dockerfile-5.6

@@ -309,7 +309,7 @@ RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Custom:       Pecl command
-	&& yes | pecl install mongo \
+	&& yes yes | pecl install mongo \
 	# Enabling
 	&& docker-php-ext-enable mongo \
 	&& true

Dockerfiles/mods/Dockerfile-7.0

@@ -39,6 +39,7 @@ RUN set -eux \
 		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
+		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
@@ -574,6 +575,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: ssh2 --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install ssh2-1.2 \
+	# Enabling
+	&& docker-php-ext-enable ssh2 \
+	&& true
+
+
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -756,6 +768,7 @@ RUN set -eux \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
+	libssh2-1 \
 	libsybdb5 \
 	libtidy5 \
 	libvpx4 \
@@ -938,6 +951,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
+	&& php -m | grep -oiE '^ssh2$' \
+	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.1

@@ -39,6 +39,7 @@ RUN set -eux \
 		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
+		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
@@ -562,6 +563,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: solr --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install solr \
+	# Enabling
+	&& docker-php-ext-enable solr \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sqlsrv --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -573,12 +585,23 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
+# -------------------- Installing PHP Extension: ssh2 --------------------
 RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install swoole \
+	&& pecl install ssh2-1.2 \
+	# Enabling
+	&& docker-php-ext-enable ssh2 \
+	&& true
+
+
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& yes yes | pecl install swoole \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true
@@ -754,6 +777,7 @@ RUN set -eux \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
+	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
@@ -933,10 +957,14 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^soap$' \
 	&& php -m | grep -oiE '^sockets$' \
 	&& php-fpm -m | grep -oiE '^sockets$' \
+	&& php -m | grep -oiE '^solr$' \
+	&& php-fpm -m | grep -oiE '^solr$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
+	&& php -m | grep -oiE '^ssh2$' \
+	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.2

@@ -39,6 +39,7 @@ RUN set -eux \
 		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
+		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
@@ -566,6 +567,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: solr --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install solr \
+	# Enabling
+	&& docker-php-ext-enable solr \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sqlsrv --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -577,12 +589,23 @@ RUN set -eux \
 	&& true
 
 
-# -------------------- Installing PHP Extension: swoole --------------------
+# -------------------- Installing PHP Extension: ssh2 --------------------
 RUN set -eux \
 	# Installation: Generic
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install swoole \
+	&& pecl install ssh2-1.2 \
+	# Enabling
+	&& docker-php-ext-enable ssh2 \
+	&& true
+
+
+# -------------------- Installing PHP Extension: swoole --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& yes yes | pecl install swoole \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true
@@ -758,6 +781,7 @@ RUN set -eux \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
+	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
@@ -939,10 +963,14 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& php -m | grep -oiE '^solr$' \
+	&& php-fpm -m | grep -oiE '^solr$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
+	&& php -m | grep -oiE '^ssh2$' \
+	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.3

@@ -10,7 +10,6 @@ RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
 		alien \
-		cmake \
 		firebird-dev \
 		freetds-dev \
 		libaio-dev \
@@ -22,7 +21,6 @@ RUN set -eux \
 		libfbclient2 \
 		libfreetype6-dev \
 		libgmp-dev \
-		libhiredis-dev \
 		libib-util \
 		libicu-dev \
 		libjpeg-dev \
@@ -41,6 +39,7 @@ RUN set -eux \
 		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
+		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
@@ -287,6 +286,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: memcache --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install memcache \
+	# Enabling
+	&& docker-php-ext-enable memcache \
+	&& true
+
+
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -557,6 +567,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: solr --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install solr \
+	# Enabling
+	&& docker-php-ext-enable solr \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sqlsrv --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -568,25 +589,23 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: ssh2 --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install ssh2-1.2 \
+	# Enabling
+	&& docker-php-ext-enable ssh2 \
+	&& true
+
+
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/swoole/swoole-src /tmp/swoole \
-	&& cd /tmp/swoole \
-	# Custom:       Branch
-	&& git checkout $(git describe --abbrev=0 --tags) \
-	# Custom:       Install command
-	&& phpize \
-&& ./configure \
-  --enable-openssl \
-  --enable-sockets \
-  --enable-http2 \
-  --enable-mysqlnd \
-  --enable-coroutine-postgresql \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
- \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& yes yes | pecl install swoole \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true
@@ -751,7 +770,6 @@ RUN set -eux \
 	libenchant1c2a \
 	libfbclient2 \
 	libfreetype6 \
-	libhiredis0.14 \
 	libicu63 \
 	libjpeg62-turbo \
 	libmagickwand-6.q16-6 \
@@ -763,6 +781,7 @@ RUN set -eux \
 	librabbitmq4 \
 	librdkafka1 \
 	librecode0 \
+	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
@@ -871,6 +890,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^mcrypt$' \
 	&& php -m | grep -oiE '^msgpack$' \
 	&& php-fpm -m | grep -oiE '^msgpack$' \
+	&& php -m | grep -oiE '^memcache$' \
+	&& php-fpm -m | grep -oiE '^memcache$' \
 	&& php -m | grep -oiE '^memcached$' \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongodb$' \
@@ -942,10 +963,14 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& php -m | grep -oiE '^solr$' \
+	&& php-fpm -m | grep -oiE '^solr$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
+	&& php -m | grep -oiE '^ssh2$' \
+	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.4

@@ -10,18 +10,17 @@ RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
 		alien \
-		cmake \
 		firebird-dev \
 		freetds-dev \
 		libaio-dev \
 		libbz2-dev \
+		libcurl4-openssl-dev \
 		libenchant-dev \
 		libevent-dev \
 		libfbclient2 \
 		libffi-dev \
 		libfreetype6-dev \
 		libgmp-dev \
-		libhiredis-dev \
 		libib-util \
 		libicu-dev \
 		libjpeg-dev \
@@ -30,6 +29,7 @@ RUN set -eux \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
+		libpcre3-dev \
 		libpng-dev \
 		libpq-dev \
 		libpspell-dev \
@@ -37,6 +37,7 @@ RUN set -eux \
 		librdkafka-dev \
 		libsasl2-dev \
 		libsnmp-dev \
+		libssh2-1-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
@@ -77,6 +78,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: apcu --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install apcu \
+	# Enabling
+	&& docker-php-ext-enable apcu \
+	&& true
+
+
 # -------------------- Installing PHP Extension: bcmath --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -85,6 +97,20 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: blackfire --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         Custom extension
+	&& version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
+&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
+&& mkdir -p /tmp/blackfire \
+&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
+&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
+&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
+ \
+	&& true
+
+
 # -------------------- Installing PHP Extension: bz2 --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -237,6 +263,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: memcache --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install memcache \
+	# Enabling
+	&& docker-php-ext-enable memcache \
+	&& true
+
+
 # -------------------- Installing PHP Extension: memcached --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -271,6 +308,17 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: oauth --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install oauth \
+	# Enabling
+	&& docker-php-ext-enable oauth \
+	&& true
+
+
 # -------------------- Installing PHP Extension: oci8 --------------------
 RUN set -eux \
 	# Generic pre-command
@@ -389,6 +437,32 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: psr --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install psr \
+	# Enabling
+	&& docker-php-ext-enable psr \
+	&& true
+
+
+# -------------------- Installing PHP Extension: phalcon --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         GIT extension
+	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
+	&& cd /tmp/phalcon \
+	# Custom:       Branch
+	&& git checkout $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | sed 's/^.*tags\///g' | grep -E '^v[.0-9]+$' | tail -1) \
+	# Custom:       Install command
+	&& cd build && ./install \
+	# Enabling
+	&& docker-php-ext-enable phalcon \
+	&& true
+
+
 # -------------------- Installing PHP Extension: pspell --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -448,10 +522,9 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: soap --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
-	# Custom:       configure command
-	&& docker-php-ext-configure soap --with-libxml-dir=/usr \
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
 	&& true
 
@@ -464,25 +537,34 @@ RUN set -eux \
 	&& true
 
 
+# -------------------- Installing PHP Extension: solr --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install solr \
+	# Enabling
+	&& docker-php-ext-enable solr \
+	&& true
+
+
+# -------------------- Installing PHP Extension: ssh2 --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install ssh2-1.2 \
+	# Enabling
+	&& docker-php-ext-enable ssh2 \
+	&& true
+
+
 # -------------------- Installing PHP Extension: swoole --------------------
 RUN set -eux \
-	# Installation: Version specific
-	# Type:         GIT extension
-	&& git clone https://github.com/swoole/swoole-src /tmp/swoole \
-	&& cd /tmp/swoole \
-	# Custom:       Branch
-	&& git checkout master \
-	# Custom:       Install command
-	&& phpize \
-&& ./configure \
-  --enable-openssl \
-  --enable-sockets \
-  --enable-http2 \
-  --enable-mysqlnd \
-  --enable-coroutine-postgresql \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
- \
+	# Installation: Generic
+	# Type:         PECL extension
+	# Custom:       Pecl command
+	&& yes yes | pecl install swoole \
 	# Enabling
 	&& docker-php-ext-enable swoole \
 	&& true
@@ -549,10 +631,11 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: xmlrpc --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
 	# Custom:       configure command
-	&& docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \
+	&& docker-php-ext-configure xmlrpc --with-iconv-dir=/usr \
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \
 	&& true
 
@@ -567,10 +650,11 @@ RUN set -eux \
 
 # -------------------- Installing PHP Extension: zip --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
 	# Custom:       configure command
-	&& docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \
+	&& docker-php-ext-configure zip --with-zip \
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \
 	&& true
 
@@ -637,7 +721,6 @@ RUN set -eux \
 	libfbclient2 \
 	libffi6 \
 	libfreetype6 \
-	libhiredis0.14 \
 	libicu63 \
 	libjpeg62-turbo \
 	libmagickwand-6.q16-6 \
@@ -648,6 +731,7 @@ RUN set -eux \
 	libpq5 \
 	librabbitmq4 \
 	librdkafka1 \
+	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
@@ -697,6 +781,8 @@ RUN set -eux \
 	\
 	&& php -m | grep -oiE '^amqp$' \
 	&& php-fpm -m | grep -oiE '^amqp$' \
+	&& php -m | grep -oiE '^apcu$' \
+	&& php-fpm -m | grep -oiE '^apcu$' \
 	&& php -m | grep -oiE '^bcmath$' \
 	&& php-fpm -m | grep -oiE '^bcmath$' \
 	&& php -m | grep -oiE '^bz2$' \
@@ -751,6 +837,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^mcrypt$' \
 	&& php -m | grep -oiE '^msgpack$' \
 	&& php-fpm -m | grep -oiE '^msgpack$' \
+	&& php -m | grep -oiE '^memcache$' \
+	&& php-fpm -m | grep -oiE '^memcache$' \
 	&& php -m | grep -oiE '^memcached$' \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongodb$' \
@@ -759,6 +847,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oauth$' \
+	&& php-fpm -m | grep -oiE '^oauth$' \
 	&& php -m | grep -oiE '^oci8$' \
 	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
@@ -785,6 +875,10 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
+	&& php -m | grep -oiE '^psr$' \
+	&& php-fpm -m | grep -oiE '^psr$' \
+	&& 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$' \
@@ -812,8 +906,12 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& php -m | grep -oiE '^solr$' \
+	&& php-fpm -m | grep -oiE '^solr$' \
 	&& php -m | grep -oiE '^spl$' \
 	&& php-fpm -m | grep -oiE '^spl$' \
+	&& php -m | grep -oiE '^ssh2$' \
+	&& php-fpm -m | grep -oiE '^ssh2$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/prod/data/docker-entrypoint.d/301-postfix.sh

@@ -22,70 +22,83 @@ set_postfix() {
 	local debug="${7}"
 
 	local php_ini_file="${php_ini_dir}/devilbox-runtime-sendmail.ini"
-	local catch_all=
+	local enable_mail=
 
+	# Verify env value
 	if ! env_set "${env_varname}"; then
 		log "info" "\$${env_varname} not set." "${debug}"
 		log "info" "Postfix will not be started." "${debug}"
 		echo "" > "${php_ini_file}"
-	else
-		catch_all="$( env_get "${env_varname}" )"
-		if [ "${catch_all}" = "1" ]; then
-			log "info" "\$${env_varname} set to 1. Enabling postfix catch-all" "${debug}"
+		return
+	fi
 
-			# Configure PHP
-			{
-				echo "[mail function]";
-				echo "sendmail_path = $( which sendmail ) -t -i";
-				echo ";mail.force_extra_parameters =";
-				echo "mail.add_x_header = On";
-				echo "mail.log = ${php_mail_log}";
-			} > "${php_ini_file}"
+	# Retrieve env value
+	enable_mail="$( env_get "${env_varname}" )"
 
-			# PHP mail function logs to file
-			if [ "${docker_logs}" != "1" ]; then
-				# Fix PHP mail log file dir/file and permissions
-				if [ ! -d "$( dirname "${php_mail_log}" )" ]; then
-					run "mkdir -p $( dirname "${php_mail_log}" )" "${debug}"
-				fi
-				if [ ! -f "${php_mail_log}" ]; then
-					run "touch ${php_mail_log}" "${debug}"
-				fi
-				run "chown ${username}:${groupname} $( dirname "${php_mail_log}" )" "${debug}"
-				run "chown ${username}:${groupname} ${php_mail_log}" "${debug}"
-				run "chmod 0644 ${php_mail_log}" "${debug}"
+	# Enable postfix
+	if [ "${enable_mail}" = "1" ] || [ "${enable_mail}" = "2" ]; then
+
+		if [ "${enable_mail}" = "1" ]; then
+			log "info" "\$${env_varname} set to 1. Enabling postfix" "${debug}"
+		else
+			log "info" "\$${env_varname} set to 2. Enabling postfix catch-all" "${debug}"
+		fi
+
+		# Configure PHP
+		{
+			echo "[mail function]";
+			echo "sendmail_path = $( command -v sendmail ) -t -i";
+			echo ";mail.force_extra_parameters =";
+			echo "mail.add_x_header = On";
+			echo "mail.log = ${php_mail_log}";
+		} > "${php_ini_file}"
+
+		# PHP mail function logs to file
+		if [ "${docker_logs}" != "1" ]; then
+			# Fix PHP mail log file dir/file and permissions
+			if [ ! -d "$( dirname "${php_mail_log}" )" ]; then
+				run "mkdir -p $( dirname "${php_mail_log}" )" "${debug}"
 			fi
-
-			# Add Mail dir/file if it does not exist
-			if [ ! -d "/var/mail" ]; then
-				run "mkdir /var/mail" "${debug}"
-			fi
-			if [ ! -f "/var/mail/${username}" ]; then
-				run "touch /var/mail/${username}" "${debug}"
+			if [ ! -f "${php_mail_log}" ]; then
+				run "touch ${php_mail_log}" "${debug}"
 			fi
+			run "chown ${username}:${groupname} $( dirname "${php_mail_log}" )" "${debug}"
+			run "chown ${username}:${groupname} ${php_mail_log}" "${debug}"
+			run "chmod 0644 ${php_mail_log}" "${debug}"
+		fi
 
-			# Fix mail dir/file permissions after mount
-			run "chmod 0644 /var/mail/${username}" "${debug}"
-			run "chown ${username}:${groupname} /var/mail" "${debug}"
-			run "chown ${username}:${groupname} /var/mail/${username}" "${debug}"
+		# Add Mail dir/file if it does not exist
+		if [ ! -d "/var/mail" ]; then
+			run "mkdir /var/mail" "${debug}"
+		fi
+		if [ ! -f "/var/mail/${username}" ]; then
+			run "touch /var/mail/${username}" "${debug}"
+		fi
 
-			# warning: specify "strict_mailbox_ownership = no" to ignore mailbox ownership mismatch
-			run "postconf -e 'strict_mailbox_ownership=no'" "${debug}"
+		# Fix mail dir/file permissions after mount
+		run "chmod 0644 /var/mail/${username}" "${debug}"
+		run "chown ${username}:${groupname} /var/mail" "${debug}"
+		run "chown ${username}:${groupname} /var/mail/${username}" "${debug}"
 
-			# Postfix configuration
-			run "postconf -e 'inet_protocols=ipv4'" "${debug}"
+		# warning: specify "strict_mailbox_ownership = no" to ignore mailbox ownership mismatch
+		run "postconf -e 'strict_mailbox_ownership=no'" "${debug}"
+
+		# Postfix configuration
+		run "postconf -e 'inet_protocols=ipv4'" "${debug}"
+
+		# Postfix catch-all
+		if [ "${enable_mail}" = "2" ]; then
 			run "postconf -e 'virtual_alias_maps=pcre:/etc/postfix/virtual'" "${debug}"
 			run "echo '/.*@.*/ ${username}' >> /etc/postfix/virtual" "${debug}"
-
 			run "newaliases" "${debug}"
-
-		elif [ "${catch_all}" = "0" ]; then
-			log "info" "\$${env_varname} set to 0. Disabling postfix catch-all" "${debug}"
-
-		else
-			log "err" "Invalid value for \$${env_varname}. Can only be 0 or 1. Prodived: ${catch_all}" "${debug}"
-			exit 1
 		fi
+
+	elif [ "${enable_mail}" = "0" ]; then
+		log "info" "\$${env_varname} set to 0. Disabling postfix" "${debug}"
+
+	else
+		log "err" "Invalid value for \$${env_varname}. Can only be 0, 1 or 2. Prodived: ${enable_mail}" "${debug}"
+		exit 1
 	fi
 }
 

Dockerfiles/prod/data/docker-entrypoint.sh

@@ -24,9 +24,6 @@ DVL_PHP_INI_DIR="/usr/local/etc/php/conf.d"
 # php-fpm conf.d directory
 DVL_PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
 
-# This is the log file for any mail related functions
-DVL_PHP_MAIL_LOG="/var/log/mail.log"
-
 # This file holds error and access log definitions
 DVL_PHP_FPM_CONF_LOGFILE="${DVL_PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
 DVL_PHP_INI_CONF_LOGFILE="${DVL_PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
@@ -34,6 +31,9 @@ DVL_PHP_INI_CONF_LOGFILE="${DVL_PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
 # PHP-FPM log dir
 DVL_FPM_LOG_DIR="/var/log/php"
 
+# This is the log file for any mail related functions
+DVL_PHP_MAIL_LOG="${DVL_FPM_LOG_DIR}/mail.log"
+
 # Custom ini dir (to be copied to actual ini dir)
 DVL_PHP_CUST_INI_DIR="/etc/php-custom.d"
 
@@ -138,7 +138,7 @@ done
 ###
 ### Supervisor: rsyslogd & postfix
 ###
-if [ "$( env_get "ENABLE_MAIL" )" = "1" ]; then
+if [ "$( env_get "ENABLE_MAIL" )" = "1" ] || [ "$( env_get "ENABLE_MAIL" )" = "2" ]; then
 	supervisor_add_service "rsyslogd" "/usr/sbin/rsyslogd -n"      "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}" "1"
 	supervisor_add_service "postfix"  "/usr/local/sbin/postfix.sh" "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 fi

Dockerfiles/prod/data/postfix.sh

@@ -22,14 +22,7 @@ set -o pipefail
 ###
 ### Variables
 ###
-if [ -f "/etc/alpine-release" ]; then
-	MAILLOG="/var/log/maillog"
-elif [ -f "/etc/debian_version" ]; then
-	MAILLOG="/var/log/mail.log"
-else
-	MAILLOG="/var/log/maillog"
-fi
-
+MAILLOG="/var/log/mail.log"
 MAILPID="/var/spool/postfix/pid/master.pid"
 
 

Dockerfiles/work/Dockerfile-5.2

@@ -191,7 +191,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-5.3

@@ -208,7 +208,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-5.4

@@ -237,7 +237,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-5.5

@@ -241,7 +241,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-5.6

@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-7.0

@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-7.1

@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-7.2

@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-7.3

@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-7.4

@@ -254,7 +254,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/Dockerfile-8.0

@@ -197,7 +197,7 @@ RUN set -eux \
  \
 	\
 # -------------------- mhsendmail --------------------
-	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+	&& wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
 && chmod +x mhsendmail_linux_amd64 \
 && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
  \

Dockerfiles/work/data/docker-entrypoint.sh

@@ -24,9 +24,6 @@ DVL_PHP_INI_DIR="/usr/local/etc/php/conf.d"
 # php-fpm conf.d directory
 DVL_PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
 
-# This is the log file for any mail related functions
-DVL_PHP_MAIL_LOG="/var/log/mail.log"
-
 # This file holds error and access log definitions
 DVL_PHP_FPM_CONF_LOGFILE="${DVL_PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
 DVL_PHP_INI_CONF_LOGFILE="${DVL_PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
@@ -34,6 +31,9 @@ DVL_PHP_INI_CONF_LOGFILE="${DVL_PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
 # PHP-FPM log dir
 DVL_FPM_LOG_DIR="/var/log/php"
 
+# This is the log file for any mail related functions
+DVL_PHP_MAIL_LOG="${DVL_FPM_LOG_DIR}/mail.log"
+
 # Custom ini dir (to be copied to actual ini dir)
 DVL_PHP_CUST_INI_DIR="/etc/php-custom.d"
 
@@ -138,7 +138,7 @@ done
 ###
 ### Supervisor: rsyslogd & postfix
 ###
-if [ "$( env_get "ENABLE_MAIL" )" = "1" ]; then
+if [ "$( env_get "ENABLE_MAIL" )" = "1" ] || [ "$( env_get "ENABLE_MAIL" )" = "2" ]; then
 	supervisor_add_service "rsyslogd" "/usr/sbin/rsyslogd -n"      "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}" "1"
 	supervisor_add_service "postfix"  "/usr/local/sbin/postfix.sh" "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 fi

README.md

@@ -627,27 +627,27 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>7.0</th>
    <td id="70-base">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, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="70-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="70-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>7.1</th>
    <td id="71-base">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, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="71-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="71-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, solr, SPL, sqlite3, sqlsrv, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>7.2</th>
    <td id="72-base">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</td>
-   <td id="72-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="72-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>7.3</th>
    <td id="73-base">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</td>
-   <td id="73-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="73-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>7.4</th>
    <td id="74-base">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</td>
-   <td id="74-mods">amqp, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, intl, json, ldap, libxml, mbstring, mcrypt, memcached, mongodb, msgpack, 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, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="74-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>8.0</th>
@@ -798,7 +798,7 @@ Have a look at the following table to see all supported environment variables fo
    <td><code>ENABLE_MAIL</code></td>
    <td>bool</td>
    <td><code>0</code></td>
-   <td>Enable local email catch-all.<br/>Postfix will be configured for local delivery and all mails sent (even to real domains) will be catched locally. No email will ever go out. They will all be stored in a local devilbox account.<br/>Value: <code>0</code> or <code>1</code></td>
+   <td>Start local postfix with or without email catch-all.<br/><code>0</code>: Postfix service disabled.<br/><code>1</code>: Postfix service started normally.<br/><code>2</code>: Postfix service started configured for local delivery and all mails sent (even to real domains) will be catched locally. No email will ever go out. They will all be stored in a local devilbox account.<br/>Value: <code>0</code>, <code>1</code> or <code>2</code></td>
   </tr>
   <tr>
    <td><code>FORWARD_PORTS_TO_LOCALHOST</code></td>
@@ -871,7 +871,7 @@ Have a look at the following table to see all offered volumes for each Docker im
   </tr>
   <tr>
    <td><code>/var/mail</code></td>
-   <td>Emails caught be the postfix catch-all (<code>ENABLE_MAIL=1</code>) will be available in this directory.</td>
+   <td>Emails caught be the postfix catch-all (<code>ENABLE_MAIL=2</code>) will be available in this directory.</td>
   </tr>
   <tr>
    <td colspan="3"></td>
@@ -1186,12 +1186,12 @@ $ docker run -d \
 
 #### Launch Postfix for mail-catching
 
-Once you set `$ENABLE_MAIL=1`, all mails sent via any of your PHP applications no matter to which domain, are catched locally into the `devilbox` account. You can also mount the mail directory locally to hook in with mutt and read those mails.
+Once you set `$ENABLE_MAIL=2`, all mails sent via any of your PHP applications no matter to which domain, are catched locally into the `devilbox` account. You can also mount the mail directory locally to hook in with mutt and read those mails.
 ```shell
 $ docker run -d \
     -p 127.0.0.1:9000:9000 \
     -v /tmp/mail:/var/mail \
-    -e ENABLE_MAIL=1 \
+    -e ENABLE_MAIL=2 \
     -t devilbox/php-fpm:7.2-prod
 ```
 

build/ansible/DOCKERFILES/Dockerfile-base.j2

@@ -3,8 +3,6 @@
 FROM devilbox/php-fpm-5.2
 {% elif php_version == 5.3 %}
 FROM devilbox/php-fpm-5.3
-{% elif php_version == 7.4 %}
-FROM devilbox/php-fpm-7.4
 {% elif php_version == 8.0 %}
 FROM devilbox/php-fpm-8.0
 {% else %}

build/ansible/group_vars/all/mods.yml

@@ -89,8 +89,11 @@ extensions_enabled:
   - soap
   - sockets
   - sodium
+  - solr
   - spl
   - sqlsrv
+  - ssh2
+  # requires sockets to be installed
   - swoole
   - sysvmsg
   - sysvsem
@@ -162,7 +165,7 @@ extensions_available:
       build_dep: [librabbitmq-dev]
       run_dep: [librabbitmq4]
   apcu:
-    disabled: [5.2, 7.4, 8.0]
+    disabled: [5.2, 8.0]
     5.3:
       type: pecl
       version: 4.0.11
@@ -181,7 +184,7 @@ extensions_available:
     all:
       type: builtin
   blackfire:
-    disabled: [5.2, 5.3, 5.4, 5.5, 7.4, 8.0]
+    disabled: [5.2, 5.3, 5.4, 5.5, 8.0]
     all:
       type: custom
       command: |
@@ -430,7 +433,7 @@ extensions_available:
       run_dep: [libmcrypt4]
       build_dep: [libmcrypt-dev]
   memcache:
-    disabled: [7.3, 7.4, 8.0]
+    disabled: [8.0]
     5.2:
       type: pecl
       version: 2.2.7
@@ -490,10 +493,10 @@ extensions_available:
     disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0] # Deprecated
     5.2:
       type: pecl
-      command: yes | pecl install mongo-1.5.8
+      command: yes yes | pecl install mongo-1.5.8
     all:
       type: pecl
-      command: yes | pecl install mongo
+      command: yes yes | pecl install mongo
       build_dep: [libssl-dev, libsasl2-dev]
   mongodb:
     disabled: [5.2]
@@ -578,7 +581,7 @@ extensions_available:
     disabled: [5.2]
     already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
   oauth:
-    disabled: [7.4, 8.0]
+    disabled: [8.0]
     5.2:
       type: pecl
       version: 1.2.3
@@ -722,7 +725,7 @@ extensions_available:
       build_dep: [libpq-dev]
       run_dep: [libpq5]
   psr:
-    disabled: [5.2, 5.3, 7.4, 8.0] # IMPORTANT: Required by PHP >= 7.2 by phalcon >=4.0 module
+    disabled: [5.2, 5.3, 8.0] # IMPORTANT: Required by PHP >= 7.2 by phalcon >=4.0 module
     5.4:
       type: pecl
       version: 0.5.1
@@ -735,7 +738,7 @@ extensions_available:
     all:
       type: pecl
   phalcon:
-    disabled: [5.2, 7.4, 8.0] # TODO: currently disabled for 7.4 as it breaks
+    disabled: [5.2, 8.0] # TODO: currently disabled for 7.4 as it breaks
     5.3:
       type: git
       git_url: https://github.com/phalcon/cphalcon
@@ -879,6 +882,8 @@ extensions_available:
       run_dep: [snmp]
   soap:
     already_avail: [5.2]
+    7.4:
+      type: builtin
     all:
       type: builtin
       configure: --with-libxml-dir=/usr
@@ -892,6 +897,11 @@ extensions_available:
     all:
       type: builtin
       build_dep: [libsodium-dev]
+  solr:
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 8.0]
+    all:
+      type: pecl
+      build_dep: [libxml2-dev, libcurl4-openssl-dev]
   spl:
     already_avail: "{{ php_all_versions }}"
   sqlsrv:
@@ -905,6 +915,13 @@ extensions_available:
       type: pecl
       build_dep: [unixodbc-dev]
       run_dep: [unixodbc]
+  ssh2:
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 8.0]
+    all:
+      type: pecl
+      version: 1.2
+      build_dep: [libssh2-1-dev]
+      run_dep: [libssh2-1]
   swoole:
     disabled: [5.2, 8.0]
     5.3:
@@ -925,40 +942,9 @@ extensions_available:
     7.0:
       type: pecl
       version: 4.2.13
-    7.3:
-      type: git
-      git_url: https://github.com/swoole/swoole-src
-      git_ref: $(git describe --abbrev=0 --tags)
-      command: |
-        phpize \
-        && ./configure \
-          --enable-openssl \
-          --enable-sockets \
-          --enable-http2 \
-          --enable-mysqlnd \
-          --enable-coroutine-postgresql \
-        && make -j$(getconf _NPROCESSORS_ONLN) \
-        && make install \
-      run_dep: [libnghttp2-14, libhiredis0.14]
-      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, libpq-dev, cmake]
-    7.4:
-      type: git
-      git_url: https://github.com/swoole/swoole-src
-      git_ref: master
-      command: |
-        phpize \
-        && ./configure \
-          --enable-openssl \
-          --enable-sockets \
-          --enable-http2 \
-          --enable-mysqlnd \
-          --enable-coroutine-postgresql \
-        && make -j$(getconf _NPROCESSORS_ONLN) \
-        && make install \
-      run_dep: [libnghttp2-14, libhiredis0.14]
-      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, libpq-dev, cmake]
     all:
       type: pecl
+      command: yes yes | pecl install swoole
       build_dep: [libnghttp2-dev, libssl-dev]
       run_dep: [libnghttp2-14]
   sysvmsg:
@@ -1063,6 +1049,9 @@ extensions_available:
   xmlreader:
     already_avail: "{{ php_all_versions }}"
   xmlrpc:
+    7.4:
+      type: builtin
+      configure: --with-iconv-dir=/usr
     all:
       type: builtin
       configure: --with-libxml-dir=/usr --with-iconv-dir=/usr
@@ -1095,6 +1084,9 @@ extensions_available:
       configure: --with-zlib-dir=/usr --with-pcre-dir=/usr
       build_dep: [zlib1g-dev]
       run_dep: []
+    7.4:
+      type: builtin
+      configure: --with-zip
     all:
       type: builtin
       configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip

build/ansible/group_vars/all/work.yml

@@ -571,7 +571,7 @@ software_available:
   mhsendmail:
     all:
       command: |
-        wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+        wget https://github.com/devilbox/mhsendmail/releases/download/v0.3.0/mhsendmail_linux_amd64 \
         && chmod +x mhsendmail_linux_amd64 \
         && mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
   mysqldumpsecure:

tests/prod/04-test-env-enable_mail.sh

@@ -23,7 +23,7 @@ FLAVOUR="${3}"
 ### Postfix
 ###
 MOUNTPOINT="$( mktemp --directory )"
-did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e ENABLE_MAIL=1 -v ${MOUNTPOINT}:/var/mail" )"
+did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -e ENABLE_MAIL=2 -v ${MOUNTPOINT}:/var/mail" )"
 run "sleep 10"
 
 if ! run "docker logs ${did} 2>&1 | grep -q 'ENABLE_MAIL'"; then
@@ -36,7 +36,7 @@ fi
 
 if [ ! -f "${MOUNTPOINT}/devilbox" ]; then
 	echo "Mail file does not exist: ${MOUNTPOINT}/devilbox"
-	ls -lap ${MOUNTPOINT}/
+	ls -lap "${MOUNTPOINT}/"
 	docker_logs "${did}" || true
 	docker_stop "${did}" || true
 	rm -rf "${MOUNTPOINT}"
@@ -45,7 +45,7 @@ if [ ! -f "${MOUNTPOINT}/devilbox" ]; then
 fi
 if [ ! -r "${MOUNTPOINT}/devilbox" ]; then
 	echo "Mail file is not readable"
-	ls -lap ${MOUNTPOINT}/
+	ls -lap "${MOUNTPOINT}/"
 	docker_logs "${did}" || true
 	docker_stop "${did}" || true
 	rm -rf "${MOUNTPOINT}"