Merge pull request #95 from devilbox/release-0.72

Release 0.72

.travis.yml

@@ -99,30 +99,30 @@ script:
       echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin &&
       if [ "${TRAVIS_BRANCH}" == "master" ]; then
         echo "Pushing latest";
-        docker push "${IMAGE}:${PHP}-base";
-        docker push "${IMAGE}:${PHP}-mods";
-        docker push "${IMAGE}:${PHP}-prod";
-        docker push "${IMAGE}:${PHP}-work";
+        until docker push "${IMAGE}:${PHP}-base"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-mods"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-prod"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-work"; do sleep 1; done;
       elif [[ ${TRAVIS_BRANCH} =~ ^(release-[.0-9]+)$ ]]; then
         echo "Pushing branch ${TRAVIS_BRANCH}";
         docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}" &&
         docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}" &&
         docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}" &&
         docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}" &&
-        docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}";
-        docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}";
-        docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}";
-        docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}";
+        until docker push "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}"; do sleep 1; done;
       elif [ -n "${TRAVIS_TAG}" ]; then
         echo "Pushing tag ${TRAVIS_TAG}";
         docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_TAG}" &&
         docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}" &&
         docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}" &&
         docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${TRAVIS_TAG}" &&
-        docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}";
-        docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}";
-        docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}";
-        docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}";
+        until docker push "${IMAGE}:${PHP}-base-${TRAVIS_TAG}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}"; do sleep 1; done;
+        until docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}"; do sleep 1; done;
       elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then
         if MY_TAG="$( git describe --exact-match "$(git rev-parse HEAD)" 2>/dev/null )"; then
           echo "Pushing cron tag ${MY_TAG}";
@@ -130,10 +130,10 @@ script:
           docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${MY_TAG}" &&
           docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${MY_TAG}" &&
           docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${MY_TAG}" &&
-          docker push "${IMAGE}:${PHP}-base-${MY_TAG}";
-          docker push "${IMAGE}:${PHP}-mods-${MY_TAG}";
-          docker push "${IMAGE}:${PHP}-prod-${MY_TAG}";
-          docker push "${IMAGE}:${PHP}-work-${MY_TAG}";
+          until docker push "${IMAGE}:${PHP}-base-${MY_TAG}"; do sleep 1; done;
+          until docker push "${IMAGE}:${PHP}-mods-${MY_TAG}"; do sleep 1; done;
+          until docker push "${IMAGE}:${PHP}-prod-${MY_TAG}"; do sleep 1; done;
+          until docker push "${IMAGE}:${PHP}-work-${MY_TAG}"; do sleep 1; done;
         fi
       else
         echo "Skipping push to dockerhub on normal branches";

Dockerfiles/mods/Dockerfile-5.2

@@ -24,6 +24,7 @@ ENV BUILD_DEPS \
 	libc-client-dev \
 	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
 	libfreetype6-dev \
 	libib-util \
@@ -202,6 +203,12 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype
 	&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
 	\
+# ---- Installing PHP Extension: msgpack ----
+	&& pecl install msgpack-0.5.7 \
+	&& docker-php-ext-enable msgpack \
+	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
+	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
+	\
 # ---- Installing PHP Extension: memcache ----
 	&& pecl install memcache \
 	&& docker-php-ext-enable memcache \
@@ -220,12 +227,6 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype
 	&& (rm -rf /usr/local/lib/php/test/mongo || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mongo || true) \
 	\
-# ---- Installing PHP Extension: msgpack ----
-	&& pecl install msgpack-0.5.7 \
-	&& docker-php-ext-enable msgpack \
-	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
-	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
-	\
 # ---- Installing PHP Extension: opcache ----
 	&& pecl install zendopcache \
 	&& docker-php-ext-enable opcache \
@@ -351,6 +352,9 @@ ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -438,14 +442,14 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
 	&& php -m | grep -oiE '^mcrypt$' \
 	&& 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 '^mongo$' \
 	&& php-fpm -m | grep -oiE '^mongo$' \
-	&& php -m | grep -oiE '^msgpack$' \
-	&& php-fpm -m | grep -oiE '^msgpack$' \
 	&& php -m | grep -oiE '^mysql$' \
 	&& php-fpm -m | grep -oiE '^mysql$' \
 	&& php -m | grep -oiE '^mysqli$' \
@@ -479,7 +483,6 @@ RUN set -x \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
-	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -498,6 +501,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 '^spl$' \
+	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \

Dockerfiles/mods/Dockerfile-5.3

@@ -18,12 +18,15 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
 	libfreetype6-dev \
 	libgmp-dev \
@@ -55,6 +58,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -106,7 +110,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/ioncube || true) \
 	\
 # ---- Installing PHP Extension: amqp ----
-	&& echo "/usr" | pecl install amqp \
+	&& pecl install amqp-1.9.3 \
 	&& docker-php-ext-enable amqp \
 	&& (rm -rf /usr/local/lib/php/test/amqp || true) \
 	&& (rm -rf /usr/local/lib/php/doc/amqp || true) \
@@ -217,6 +221,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
 	\
+# ---- Installing PHP Extension: msgpack ----
+	&& pecl install msgpack-0.5.7 \
+	&& docker-php-ext-enable msgpack \
+	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
+	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
+	\
 # ---- Installing PHP Extension: memcache ----
 	&& pecl install memcache \
 	&& docker-php-ext-enable memcache \
@@ -241,17 +251,28 @@ RUN set -x \
 	&& (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 \
-	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
-	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
-	\
 # ---- Installing PHP Extension: mysqli ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oci8 ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
+	&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& pecl install zendopcache \
 	&& docker-php-ext-enable opcache \
@@ -399,6 +420,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -492,6 +516,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
 	&& php -m | grep -oiE '^mcrypt$' \
 	&& 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$' \
@@ -500,14 +526,14 @@ RUN set -x \
 	&& 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$' \
 	&& php-fpm -m | grep -oiE '^mysql$' \
 	&& php -m | grep -oiE '^mysqli$' \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oci8$' \
+	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \
@@ -538,6 +564,7 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^posix$' \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
+	&& php -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -558,6 +585,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 '^spl$' \
+	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-5.4

@@ -18,12 +18,15 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
 	libfreetype6-dev \
 	libgmp-dev \
@@ -55,6 +58,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -106,7 +110,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/ioncube || true) \
 	\
 # ---- Installing PHP Extension: amqp ----
-	&& echo "/usr" | pecl install amqp \
+	&& pecl install amqp-1.9.3 \
 	&& docker-php-ext-enable amqp \
 	&& (rm -rf /usr/local/lib/php/test/amqp || true) \
 	&& (rm -rf /usr/local/lib/php/doc/amqp || true) \
@@ -217,6 +221,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
 	\
+# ---- Installing PHP Extension: msgpack ----
+	&& pecl install msgpack-0.5.7 \
+	&& docker-php-ext-enable msgpack \
+	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
+	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
+	\
 # ---- Installing PHP Extension: memcache ----
 	&& pecl install memcache \
 	&& docker-php-ext-enable memcache \
@@ -241,12 +251,6 @@ RUN set -x \
 	&& (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 \
-	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
-	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
-	\
 # ---- Installing PHP Extension: mysql ----
 	&& /usr/local/bin/docker-php-ext-install mysql \
 	&& (rm -rf /usr/local/lib/php/test/mysql || true) \
@@ -257,6 +261,23 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oci8 ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install oci8 \
+	&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& pecl install zendopcache \
 	&& docker-php-ext-enable opcache \
@@ -404,6 +425,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -497,6 +521,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
 	&& php -m | grep -oiE '^mcrypt$' \
 	&& 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$' \
@@ -505,14 +531,14 @@ RUN set -x \
 	&& 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$' \
 	&& php-fpm -m | grep -oiE '^mysql$' \
 	&& php -m | grep -oiE '^mysqli$' \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oci8$' \
+	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \
@@ -544,7 +570,6 @@ RUN set -x \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
-	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -565,6 +590,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 '^spl$' \
+	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-5.5

@@ -18,12 +18,15 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
 	libfreetype6-dev \
 	libgmp-dev \
@@ -56,6 +59,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -107,7 +111,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/ioncube || true) \
 	\
 # ---- Installing PHP Extension: amqp ----
-	&& echo "/usr" | pecl install amqp \
+	&& pecl install amqp-1.9.3 \
 	&& docker-php-ext-enable amqp \
 	&& (rm -rf /usr/local/lib/php/test/amqp || true) \
 	&& (rm -rf /usr/local/lib/php/doc/amqp || true) \
@@ -207,6 +211,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
 	\
+# ---- Installing PHP Extension: msgpack ----
+	&& pecl install msgpack-0.5.7 \
+	&& docker-php-ext-enable msgpack \
+	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
+	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
+	\
 # ---- Installing PHP Extension: memcache ----
 	&& pecl install memcache \
 	&& docker-php-ext-enable memcache \
@@ -231,12 +241,6 @@ RUN set -x \
 	&& (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 \
-	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
-	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
-	\
 # ---- Installing PHP Extension: mysql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
 	&& (rm -rf /usr/local/lib/php/test/mysql || true) \
@@ -247,6 +251,23 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oci8 ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
+	&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
 	&& (rm -rf /usr/local/lib/php/test/opcache || true) \
@@ -287,7 +308,7 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone 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') \
+	&& git checkout v3.4.2 \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
@@ -398,6 +419,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -491,6 +515,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
 	&& php -m | grep -oiE '^mcrypt$' \
 	&& 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$' \
@@ -499,14 +525,14 @@ RUN set -x \
 	&& 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$' \
 	&& php-fpm -m | grep -oiE '^mysql$' \
 	&& php -m | grep -oiE '^mysqli$' \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oci8$' \
+	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \
@@ -538,7 +564,6 @@ RUN set -x \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
-	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -559,6 +584,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 '^spl$' \
+	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-5.6

@@ -18,12 +18,15 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
 	libfreetype6-dev \
 	libgmp-dev \
@@ -58,6 +61,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -127,6 +131,17 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
 	&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
 	\
+# ---- Installing PHP Extension: blackfire ----
+	&& 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 \
+ \
+	&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
+	&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
+	\
 # ---- Installing PHP Extension: bz2 ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
 	&& (rm -rf /usr/local/lib/php/test/bz2 || true) \
@@ -211,6 +226,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
 	\
+# ---- Installing PHP Extension: msgpack ----
+	&& pecl install msgpack-0.5.7 \
+	&& docker-php-ext-enable msgpack \
+	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
+	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
+	\
 # ---- Installing PHP Extension: memcache ----
 	&& pecl install memcache \
 	&& docker-php-ext-enable memcache \
@@ -235,12 +256,6 @@ RUN set -x \
 	&& (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 \
-	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
-	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
-	\
 # ---- Installing PHP Extension: mysql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
 	&& (rm -rf /usr/local/lib/php/test/mysql || true) \
@@ -251,6 +266,23 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oci8 ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
+	&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
 	&& (rm -rf /usr/local/lib/php/test/opcache || true) \
@@ -291,7 +323,7 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone 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') \
+	&& git checkout v3.4.2 \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
@@ -402,6 +434,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -495,6 +530,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
 	&& php -m | grep -oiE '^mcrypt$' \
 	&& 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$' \
@@ -503,14 +540,14 @@ RUN set -x \
 	&& 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$' \
 	&& php-fpm -m | grep -oiE '^mysql$' \
 	&& php -m | grep -oiE '^mysqli$' \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oci8$' \
+	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \
@@ -535,12 +572,13 @@ RUN set -x \
 	&& 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$' \
 	&& php-fpm -m | grep -oiE '^posix$' \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
-	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -561,6 +599,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 '^spl$' \
+	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.0

@@ -18,12 +18,15 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
 	libfreetype6-dev \
 	libgmp-dev \
@@ -53,11 +56,13 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -82,6 +87,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -126,6 +132,17 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
 	&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
 	\
+# ---- Installing PHP Extension: blackfire ----
+	&& 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 \
+ \
+	&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
+	&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
+	\
 # ---- Installing PHP Extension: bz2 ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
 	&& (rm -rf /usr/local/lib/php/test/bz2 || true) \
@@ -210,6 +227,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
 	\
+# ---- Installing PHP Extension: msgpack ----
+	&& pecl install msgpack \
+	&& docker-php-ext-enable msgpack \
+	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
+	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
+	\
 # ---- Installing PHP Extension: memcache ----
 	&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
 	&& cd /tmp/memcache \
@@ -233,17 +256,28 @@ RUN set -x \
 	&& (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 \
-	&& docker-php-ext-enable msgpack \
-	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
-	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
-	\
 # ---- Installing PHP Extension: mysqli ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oci8 ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
+	&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
 	&& (rm -rf /usr/local/lib/php/test/opcache || true) \
@@ -254,11 +288,6 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pcntl || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pcntl || true) \
 	\
-# ---- Installing PHP Extension: pdo ----
-	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo \
-	&& (rm -rf /usr/local/lib/php/test/pdo || true) \
-	&& (rm -rf /usr/local/lib/php/doc/pdo || true) \
-	\
 # ---- Installing PHP Extension: pdo_dblib ----
 	&& ln -s /usr/lib/x86_64-linux-gnu/libsybdb.* /usr/lib/ \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \
@@ -276,11 +305,34 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pdo_mysql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_mysql || true) \
 	\
+# ---- Installing PHP Extension: pdo_oci ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_oci \
+	&& (rm -rf /usr/local/lib/php/test/pdo_oci || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_oci || true) \
+	\
 # ---- Installing PHP Extension: pdo_pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
+# ---- Installing PHP Extension: pdo_sqlsrv ----
+	&& pecl install pdo_sqlsrv \
+	&& docker-php-ext-enable pdo_sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
@@ -289,7 +341,7 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone 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') \
+	&& git checkout v3.4.2 \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
@@ -339,6 +391,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: sqlsrv ----
+	&& pecl install sqlsrv \
+	&& docker-php-ext-enable sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: swoole ----
 	&& pecl install swoole \
 	&& docker-php-ext-enable swoole \
@@ -405,6 +463,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -498,18 +559,20 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
 	&& php -m | grep -oiE '^mcrypt$' \
 	&& 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$' \
 	&& php-fpm -m | grep -oiE '^mongodb$' \
-	&& php -m | grep -oiE '^msgpack$' \
-	&& php-fpm -m | grep -oiE '^msgpack$' \
 	&& php -m | grep -oiE '^mysqli$' \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oci8$' \
+	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \
@@ -526,20 +589,25 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_firebird$' \
 	&& php -m | grep -oiE '^pdo_mysql$' \
 	&& php-fpm -m | grep -oiE '^pdo_mysql$' \
+	&& php -m | grep -oiE '^pdo_oci$' \
+	&& php-fpm -m | grep -oiE '^pdo_oci$' \
 	&& php -m | grep -oiE '^pdo_pgsql$' \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
+	&& php -m | grep -oiE '^pdo_sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
 	&& 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$' \
 	&& php-fpm -m | grep -oiE '^posix$' \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
-	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -560,6 +628,10 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^soap$' \
 	&& php -m | grep -oiE '^sockets$' \
 	&& php-fpm -m | grep -oiE '^sockets$' \
+	&& 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 '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.1

@@ -18,12 +18,15 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
 	libfreetype6-dev \
 	libgmp-dev \
@@ -53,11 +56,13 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -82,6 +87,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -126,6 +132,17 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
 	&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
 	\
+# ---- Installing PHP Extension: blackfire ----
+	&& 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 \
+ \
+	&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
+	&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
+	\
 # ---- Installing PHP Extension: bz2 ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
 	&& (rm -rf /usr/local/lib/php/test/bz2 || true) \
@@ -210,6 +227,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
 	\
+# ---- Installing PHP Extension: msgpack ----
+	&& pecl install msgpack \
+	&& docker-php-ext-enable msgpack \
+	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
+	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
+	\
 # ---- Installing PHP Extension: memcache ----
 	&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
 	&& cd /tmp/memcache \
@@ -233,17 +256,28 @@ RUN set -x \
 	&& (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 \
-	&& docker-php-ext-enable msgpack \
-	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
-	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
-	\
 # ---- Installing PHP Extension: mysqli ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oci8 ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
+	&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
 	&& (rm -rf /usr/local/lib/php/test/opcache || true) \
@@ -271,11 +305,34 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pdo_mysql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_mysql || true) \
 	\
+# ---- Installing PHP Extension: pdo_oci ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_oci \
+	&& (rm -rf /usr/local/lib/php/test/pdo_oci || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_oci || true) \
+	\
 # ---- Installing PHP Extension: pdo_pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
+# ---- Installing PHP Extension: pdo_sqlsrv ----
+	&& pecl install pdo_sqlsrv \
+	&& docker-php-ext-enable pdo_sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
@@ -284,7 +341,7 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone 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') \
+	&& git checkout v3.4.2 \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
@@ -334,6 +391,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: sqlsrv ----
+	&& pecl install sqlsrv \
+	&& docker-php-ext-enable sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: swoole ----
 	&& pecl install swoole \
 	&& docker-php-ext-enable swoole \
@@ -400,6 +463,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -493,18 +559,20 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
 	&& php -m | grep -oiE '^mcrypt$' \
 	&& 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$' \
 	&& php-fpm -m | grep -oiE '^mongodb$' \
-	&& php -m | grep -oiE '^msgpack$' \
-	&& php-fpm -m | grep -oiE '^msgpack$' \
 	&& php -m | grep -oiE '^mysqli$' \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oci8$' \
+	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \
@@ -521,10 +589,14 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_firebird$' \
 	&& php -m | grep -oiE '^pdo_mysql$' \
 	&& php-fpm -m | grep -oiE '^pdo_mysql$' \
+	&& php -m | grep -oiE '^pdo_oci$' \
+	&& php-fpm -m | grep -oiE '^pdo_oci$' \
 	&& php -m | grep -oiE '^pdo_pgsql$' \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
+	&& php -m | grep -oiE '^pdo_sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
 	&& php -m | grep -oiE '^phalcon$' \
@@ -536,7 +608,6 @@ RUN set -x \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
-	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -557,6 +628,10 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^soap$' \
 	&& php -m | grep -oiE '^sockets$' \
 	&& php-fpm -m | grep -oiE '^sockets$' \
+	&& 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 '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.2

@@ -18,12 +18,15 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
 	libfreetype6-dev \
 	libgmp-dev \
@@ -53,11 +56,13 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -82,6 +87,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -126,6 +132,17 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
 	&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
 	\
+# ---- Installing PHP Extension: blackfire ----
+	&& 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 \
+ \
+	&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
+	&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
+	\
 # ---- Installing PHP Extension: bz2 ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
 	&& (rm -rf /usr/local/lib/php/test/bz2 || true) \
@@ -211,6 +228,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mcrypt || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mcrypt || true) \
 	\
+# ---- Installing PHP Extension: msgpack ----
+	&& pecl install msgpack \
+	&& docker-php-ext-enable msgpack \
+	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
+	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
+	\
 # ---- Installing PHP Extension: memcache ----
 	&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
 	&& cd /tmp/memcache \
@@ -234,17 +257,28 @@ RUN set -x \
 	&& (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 \
-	&& docker-php-ext-enable msgpack \
-	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
-	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
-	\
 # ---- Installing PHP Extension: mysqli ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oci8 ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
+	&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
 	&& (rm -rf /usr/local/lib/php/test/opcache || true) \
@@ -272,11 +306,34 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pdo_mysql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_mysql || true) \
 	\
+# ---- Installing PHP Extension: pdo_oci ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_oci \
+	&& (rm -rf /usr/local/lib/php/test/pdo_oci || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_oci || true) \
+	\
 # ---- Installing PHP Extension: pdo_pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
+# ---- Installing PHP Extension: pdo_sqlsrv ----
+	&& pecl install pdo_sqlsrv \
+	&& docker-php-ext-enable pdo_sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
@@ -285,7 +342,7 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone 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') \
+	&& 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) \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
@@ -335,6 +392,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: sqlsrv ----
+	&& pecl install sqlsrv \
+	&& docker-php-ext-enable sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: swoole ----
 	&& pecl install swoole \
 	&& docker-php-ext-enable swoole \
@@ -401,6 +464,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -494,18 +560,20 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
 	&& php -m | grep -oiE '^mcrypt$' \
 	&& 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$' \
 	&& php-fpm -m | grep -oiE '^mongodb$' \
-	&& php -m | grep -oiE '^msgpack$' \
-	&& php-fpm -m | grep -oiE '^msgpack$' \
 	&& php -m | grep -oiE '^mysqli$' \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oci8$' \
+	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \
@@ -522,10 +590,14 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_firebird$' \
 	&& php -m | grep -oiE '^pdo_mysql$' \
 	&& php-fpm -m | grep -oiE '^pdo_mysql$' \
+	&& php -m | grep -oiE '^pdo_oci$' \
+	&& php-fpm -m | grep -oiE '^pdo_oci$' \
 	&& php -m | grep -oiE '^pdo_pgsql$' \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
+	&& php -m | grep -oiE '^pdo_sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
 	&& php -m | grep -oiE '^phalcon$' \
@@ -537,7 +609,6 @@ RUN set -x \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
-	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -560,6 +631,10 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& 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 '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.3

@@ -18,13 +18,16 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	cmake \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
 	libfreetype6-dev \
 	libgmp-dev \
@@ -53,11 +56,13 @@ ENV BUILD_DEPS \
 	libxslt-dev \
 	libzip-dev \
 	snmp \
+	unixodbc-dev \
 	zlib1g-dev \
 	ca-certificates \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -81,6 +86,7 @@ ENV RUN_DEPS \
 	libxslt1.1 \
 	libzip4 \
 	snmp \
+	unixodbc \
 	ca-certificates
 
 
@@ -105,6 +111,17 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
 	&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
 	\
+# ---- Installing PHP Extension: blackfire ----
+	&& 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 \
+ \
+	&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
+	&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
+	\
 # ---- Installing PHP Extension: bz2 ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
 	&& (rm -rf /usr/local/lib/php/test/bz2 || true) \
@@ -184,11 +201,14 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/ldap || true) \
 	&& (rm -rf /usr/local/lib/php/doc/ldap || true) \
 	\
+# ---- Installing PHP Extension: msgpack ----
+	&& pecl install msgpack \
+	&& docker-php-ext-enable msgpack \
+	&& (rm -rf /usr/local/lib/php/test/msgpack || true) \
+	&& (rm -rf /usr/local/lib/php/doc/msgpack || true) \
+	\
 # ---- Installing PHP Extension: memcached ----
-	&& git clone https://github.com/php-memcached-dev/php-memcached /tmp/memcached \
-	&& cd /tmp/memcached \
-	&& git checkout master \
-	&& phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install \
+	&& pecl install memcached \
 	&& docker-php-ext-enable memcached \
 	&& (rm -rf /usr/local/lib/php/test/memcached || true) \
 	&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
@@ -204,6 +224,23 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oci8 ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
+	&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
 	&& (rm -rf /usr/local/lib/php/test/opcache || true) \
@@ -231,16 +268,48 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pdo_mysql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_mysql || true) \
 	\
+# ---- Installing PHP Extension: pdo_oci ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_oci \
+	&& (rm -rf /usr/local/lib/php/test/pdo_oci || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_oci || true) \
+	\
 # ---- Installing PHP Extension: pdo_pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_pgsql || true) \
 	\
+# ---- Installing PHP Extension: pdo_sqlsrv ----
+	&& pecl install pdo_sqlsrv-5.5.0preview \
+	&& docker-php-ext-enable pdo_sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/pdo_sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
 	&& (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 $(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) \
+	&& cd build && ./install \
+	&& 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) \
@@ -285,6 +354,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: sqlsrv ----
+	&& pecl install sqlsrv-5.5.0preview \
+	&& docker-php-ext-enable sqlsrv \
+	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
+	\
 # ---- Installing PHP Extension: swoole ----
 	&& git clone https://github.com/swoole/swoole-src /tmp/swoole \
 	&& cd /tmp/swoole \
@@ -364,6 +439,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -453,6 +531,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^libxml$' \
 	&& php -m | grep -oiE '^mbstring$' \
 	&& php-fpm -m | grep -oiE '^mbstring$' \
+	&& php -m | grep -oiE '^msgpack$' \
+	&& php-fpm -m | grep -oiE '^msgpack$' \
 	&& php -m | grep -oiE '^memcached$' \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongodb$' \
@@ -461,6 +541,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oci8$' \
+	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \
@@ -477,12 +559,18 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_firebird$' \
 	&& php -m | grep -oiE '^pdo_mysql$' \
 	&& php-fpm -m | grep -oiE '^pdo_mysql$' \
+	&& php -m | grep -oiE '^pdo_oci$' \
+	&& php-fpm -m | grep -oiE '^pdo_oci$' \
 	&& php -m | grep -oiE '^pdo_pgsql$' \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
+	&& php -m | grep -oiE '^pdo_sqlsrv$' \
+	&& php-fpm -m | grep -oiE '^pdo_sqlsrv$' \
 	&& 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$' \
@@ -490,7 +578,6 @@ RUN set -x \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
-	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -513,6 +600,10 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& 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 '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/mods/Dockerfile-7.4

@@ -18,21 +18,22 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	cmake \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
-	libc-client-dev \
-	libcurl4-openssl-dev \
 	libenchant-dev \
+	libevent-dev \
 	libfbclient2 \
+	libffi-dev \
 	libfreetype6-dev \
 	libgmp-dev \
 	libhiredis-dev \
 	libib-util \
 	libicu-dev \
 	libjpeg-dev \
-	libkrb5-dev \
 	libldap2-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
@@ -57,10 +58,11 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
-	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
+	libffi6 \
 	libfreetype6 \
 	libhiredis0.13 \
 	libicu57 \
@@ -122,6 +124,18 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/exif || true) \
 	&& (rm -rf /usr/local/lib/php/doc/exif || true) \
 	\
+# ---- Installing PHP Extension: ffi ----
+	&& git clone https://github.com/dstogov/php-ffi /tmp/ffi \
+	&& cd /tmp/ffi \
+	&& phpize \
+&& ./configure --with-ffi \
+&& make -j$(getconf _NPROCESSORS_ONLN) \
+&& make install \
+ \
+	&& docker-php-ext-enable ffi \
+	&& (rm -rf /usr/local/lib/php/test/ffi || true) \
+	&& (rm -rf /usr/local/lib/php/doc/ffi || true) \
+	\
 # ---- Installing PHP Extension: gd ----
 	&& ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/ \
 	&& /usr/local/bin/docker-php-ext-configure gd --with-gd --with-webp-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-jis-conv \
@@ -146,13 +160,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) \
@@ -190,6 +197,23 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
 	\
+# ---- Installing PHP Extension: oci8 ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
+	&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
+	&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
+	\
 # ---- Installing PHP Extension: opcache ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
 	&& (rm -rf /usr/local/lib/php/test/opcache || true) \
@@ -217,6 +241,23 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pdo_mysql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pdo_mysql || true) \
 	\
+# ---- Installing PHP Extension: pdo_oci ----
+	&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+  https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+&& (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+ \
+	&& /usr/local/bin/docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_oci \
+	&& (rm -rf /usr/local/lib/php/test/pdo_oci || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_oci || true) \
+	\
 # ---- Installing PHP Extension: pdo_pgsql ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \
 	&& (rm -rf /usr/local/lib/php/test/pdo_pgsql || true) \
@@ -353,6 +394,9 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/zip || true) \
 	&& (rm -rf /usr/local/lib/php/doc/zip || true) \
 	\
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -406,6 +450,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^enchant$' \
 	&& php -m | grep -oiE '^exif$' \
 	&& php-fpm -m | grep -oiE '^exif$' \
+	&& php -m | grep -oiE '^ffi$' \
+	&& php-fpm -m | grep -oiE '^ffi$' \
 	&& php -m | grep -oiE '^fileinfo$' \
 	&& php-fpm -m | grep -oiE '^fileinfo$' \
 	&& php -m | grep -oiE '^filter$' \
@@ -424,8 +470,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$' \
@@ -446,6 +490,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^mysqli$' \
 	&& php -m | grep -oiE '^mysqlnd$' \
 	&& php-fpm -m | grep -oiE '^mysqlnd$' \
+	&& php -m | grep -oiE '^oci8$' \
+	&& php-fpm -m | grep -oiE '^oci8$' \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 	&& php -m | grep -oiE '^openssl$' \
@@ -462,6 +508,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_firebird$' \
 	&& php -m | grep -oiE '^pdo_mysql$' \
 	&& php-fpm -m | grep -oiE '^pdo_mysql$' \
+	&& php -m | grep -oiE '^pdo_oci$' \
+	&& php-fpm -m | grep -oiE '^pdo_oci$' \
 	&& php -m | grep -oiE '^pdo_pgsql$' \
 	&& php-fpm -m | grep -oiE '^pdo_pgsql$' \
 	&& php -m | grep -oiE '^pdo_sqlite$' \
@@ -475,7 +523,6 @@ RUN set -x \
 	&& php -m | grep -oiE '^pspell$' \
 	&& php-fpm -m | grep -oiE '^pspell$' \
 	&& php -m | grep -oiE '^readline$' \
-	&& php-fpm -m | grep -oiE '^readline$' \
 	&& php -m | grep -oiE '^recode$' \
 	&& php-fpm -m | grep -oiE '^recode$' \
 	&& php -m | grep -oiE '^redis$' \
@@ -498,6 +545,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^sockets$' \
 	&& php -m | grep -oiE '^sodium$' \
 	&& php-fpm -m | grep -oiE '^sodium$' \
+	&& php -m | grep -oiE '^spl$' \
+	&& php-fpm -m | grep -oiE '^spl$' \
 	&& php -m | grep -oiE '^swoole$' \
 	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \

Dockerfiles/prod/Dockerfile-5.2

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/Dockerfile-5.3

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/Dockerfile-5.4

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/Dockerfile-5.5

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/Dockerfile-5.6

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/Dockerfile-7.0

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/Dockerfile-7.1

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/Dockerfile-7.2

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/Dockerfile-7.3

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/Dockerfile-7.4

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -72,9 +73,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

Dockerfiles/prod/data/docker-entrypoint.d/310-custom-startup-scripts.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+
+############################################################
+# Functions
+############################################################
+
+###
+### Execute custom uesr-supplied scripts
+###
+execute_custom_scripts() {
+	local script_dir="${1}"
+	local debug="${2}"
+
+	if [ ! -d "${script_dir}" ]; then
+		run "mkdir -p ${script_dir}" "${debug}"
+	fi
+	script_files="$( find "${script_dir}" -type f -iname '*.sh' )"
+
+	# loop over them line by line
+	IFS='
+	'
+	for script_f in ${script_files}; do
+		script_name="$( basename "${script_f}" )"
+		log "info" "Executing custom startup script: ${script_name}" "${debug}"
+		if ! bash "${script_f}"; then
+			log "err" "Failed to execute script" "${debug}"
+			exit 1
+		fi
+	done
+}
+
+
+############################################################
+# Sanity Checks
+############################################################
+
+if ! command -v find >/dev/null 2>&1; then
+	echo "find not found, but required."
+	exit 1
+fi
+if ! command -v basename >/dev/null 2>&1; then
+	echo "basename not found, but required."
+	exit 1
+fi

Dockerfiles/prod/data/docker-entrypoint.sh

@@ -16,38 +16,38 @@ set -p pipefail
 #   MY_GID
 
 # Path to scripts to source
-CONFIG_DIR="/docker-entrypoint.d"
+DVL_CONFIG_DIR="/docker-entrypoint.d"
 
 # php.ini.d directory
-PHP_INI_DIR="/usr/local/etc/php/conf.d"
+DVL_PHP_INI_DIR="/usr/local/etc/php/conf.d"
 
 # php-fpm conf.d directory
-PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
+DVL_PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
 
 # This is the log file for any mail related functions
-PHP_MAIL_LOG="/var/log/mail.log"
+DVL_PHP_MAIL_LOG="/var/log/mail.log"
 
 # This file holds error and access log definitions
-PHP_FPM_CONF_LOGFILE="${PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
-PHP_INI_CONF_LOGFILE="${PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
+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"
 
 # PHP-FPM log dir
-FPM_LOG_DIR="/var/log/php"
+DVL_FPM_LOG_DIR="/var/log/php"
 
 # Custom ini dir (to be copied to actual ini dir)
-PHP_CUST_INI_DIR="/etc/php-custom.d"
+DVL_PHP_CUST_INI_DIR="/etc/php-custom.d"
 
 # Custom PHP-FPM dir (to be copied to actual FPM conf dir)
-PHP_CUST_FPM_DIR="/etc/php-fpm-custom.d"
+DVL_PHP_CUST_FPM_DIR="/etc/php-fpm-custom.d"
 
 # Supervisord config directory
-SUPERVISOR_CONFD="/etc/supervisor/conf.d"
+DVL_SUPERVISOR_CONFD="/etc/supervisor/conf.d"
 
 
 ###
 ### Source libs
 ###
-init="$( find "${CONFIG_DIR}" -name '*.sh' -type f | sort -u )"
+init="$( find "${DVL_CONFIG_DIR}" -name '*.sh' -type f | sort -u )"
 for f in ${init}; do
 	# shellcheck disable=SC1090
 	. "${f}"
@@ -76,7 +76,7 @@ set_gid "NEW_GID" "${MY_GROUP}" "/home/${MY_USER}" "${DEBUG_LEVEL}"
 ###
 ### Set timezone
 ###
-set_timezone "TIMEZONE" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
+set_timezone "TIMEZONE" "${DVL_PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
@@ -92,9 +92,9 @@ fi
 ###
 set_docker_logs \
 	"DOCKER_LOGS" \
-	"${FPM_LOG_DIR}" \
-	"${PHP_FPM_CONF_LOGFILE}" \
-	"${PHP_INI_CONF_LOGFILE}" \
+	"${DVL_FPM_LOG_DIR}" \
+	"${DVL_PHP_FPM_CONF_LOGFILE}" \
+	"${DVL_PHP_INI_CONF_LOGFILE}" \
 	"${MY_USER}" \
 	"${MY_GROUP}" \
 	"${DEBUG_LEVEL}"
@@ -105,10 +105,10 @@ set_docker_logs \
 ###
 if is_docker_logs_enabled "DOCKER_LOGS" >/dev/null; then
 	# PHP mail function should log to stderr
-	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${PHP_INI_DIR}" "/proc/self/fd/2" "1" "${DEBUG_LEVEL}"
+	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${DVL_PHP_INI_DIR}" "/proc/self/fd/2" "1" "${DEBUG_LEVEL}"
 else
 	# PHP mail function should log to file
-	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${PHP_INI_DIR}" "${PHP_MAIL_LOG}" "0" "${DEBUG_LEVEL}"
+	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${DVL_PHP_INI_DIR}" "${DVL_PHP_MAIL_LOG}" "0" "${DEBUG_LEVEL}"
 fi
 
 
@@ -130,7 +130,7 @@ for line in $( port_forward_get_lines "FORWARD_PORTS_TO_LOCALHOST" ); do
 	supervisor_add_service \
 		"socat-${lport}-${rhost}-${rport}" \
 		"/usr/bin/socat tcp-listen:${lport},reuseaddr,fork tcp:${rhost}:${rport}" \
-		"${SUPERVISOR_CONFD}" \
+		"${DVL_SUPERVISOR_CONFD}" \
 		"${DEBUG_LEVEL}"
 done
 
@@ -139,30 +139,30 @@ done
 ### Supervisor: rsyslogd & postfix
 ###
 if [ "$( env_get "ENABLE_MAIL" )" = "1" ]; then
-	supervisor_add_service "rsyslogd" "/usr/sbin/rsyslogd -n"      "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}" "1"
-	supervisor_add_service "postfix"  "/usr/local/sbin/postfix.sh" "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
+	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
 
 
 ###
 ### Supervisor: php-fpm
 ###
-supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
+supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Copy custom *.ini files
 ###
-copy_ini_files "${PHP_CUST_INI_DIR}" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
+copy_ini_files "${DVL_PHP_CUST_INI_DIR}" "${DVL_PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Copy custom PHP-FPM *.conf files
 ###
 if [ "${PHP_VERSION}" = "5.2" ]; then
-	copy_fpm_5_2_conf_file "${PHP_CUST_FPM_DIR}/php-fpm.xml" "${DEBUG_LEVEL}"
+	copy_fpm_5_2_conf_file "${DVL_PHP_CUST_FPM_DIR}/php-fpm.xml" "${DEBUG_LEVEL}"
 else
-	copy_fpm_files "${PHP_CUST_FPM_DIR}" "${PHP_FPM_DIR}" "${DEBUG_LEVEL}"
+	copy_fpm_files "${DVL_PHP_CUST_FPM_DIR}" "${DVL_PHP_FPM_DIR}" "${DEBUG_LEVEL}"
 fi
 
 
@@ -178,6 +178,14 @@ enable_modules "ENABLE_MODULES" "${DEBUG_LEVEL}"
 disable_modules "DISABLE_MODULES" "${DEBUG_LEVEL}"
 
 
+###
+### Run custom user supplied scripts
+###
+execute_custom_scripts "/startup.1.d" "${DEBUG_LEVEL}"
+execute_custom_scripts "/startup.2.d" "${DEBUG_LEVEL}"
+
+
+###
 ###
 ### Startup
 ###

Dockerfiles/work/Dockerfile-5.2

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -198,13 +202,15 @@ RUN set -x \
 && rm -rf /usr/local/src/mysqldump-secure \
  \
 # phpcs
-	&& curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # webpack
@@ -306,6 +312,7 @@ RUN set -x \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
@@ -328,10 +335,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/Dockerfile-5.3

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -228,17 +232,23 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# php-cs-fixer
+	&& curl -sS -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+&& chmod +x /usr/local/bin/php-cs-fixer \
+ \
 # phpunit
 	&& curl -qL https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \
 && chmod +x /usr/local/bin/phpunit \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # webpack
@@ -347,7 +357,9 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
@@ -371,10 +383,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/Dockerfile-5.4

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -151,7 +155,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -254,17 +258,23 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# php-cs-fixer
+	&& curl -sS -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+&& chmod +x /usr/local/bin/php-cs-fixer \
+ \
 # phpunit
 	&& curl -qL https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \
 && chmod +x /usr/local/bin/phpunit \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # symfony
@@ -367,7 +377,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& git-flow version | grep -E '[.0-9]+' \
@@ -379,7 +389,9 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
@@ -404,10 +416,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/Dockerfile-5.5

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -155,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -261,13 +265,17 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# php-cs-fixer
+	&& curl -sS -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+&& chmod +x /usr/local/bin/php-cs-fixer \
+ \
 # phpunit
 	&& curl -qL https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \
 && chmod +x /usr/local/bin/phpunit \
@@ -276,6 +284,8 @@ RUN set -x \
 	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
 && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # symfony
@@ -379,7 +389,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \
@@ -392,8 +402,10 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \
 	&& photon --version | grep -E 'Installer [.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
@@ -418,10 +430,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/Dockerfile-5.6

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -155,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -274,13 +278,17 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# php-cs-fixer
+	&& curl -sS -L https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+&& chmod +x /usr/local/bin/php-cs-fixer \
+ \
 # phpunit
 	&& curl -qL https://phar.phpunit.de/phpunit-5.phar > /usr/local/bin/phpunit 2>/dev/null \
 && chmod +x /usr/local/bin/phpunit \
@@ -289,6 +297,8 @@ RUN set -x \
 	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
 && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # symfony
@@ -392,7 +402,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \
@@ -406,8 +416,10 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \
 	&& photon --version | grep -E 'Installer [.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
@@ -432,10 +444,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/Dockerfile-7.0

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -155,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -274,13 +278,17 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# php-cs-fixer
+	&& curl -sS -L https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+&& chmod +x /usr/local/bin/php-cs-fixer \
+ \
 # phpunit
 	&& curl -qL https://phar.phpunit.de/phpunit-6.phar > /usr/local/bin/phpunit 2>/dev/null \
 && chmod +x /usr/local/bin/phpunit \
@@ -289,6 +297,8 @@ RUN set -x \
 	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
 && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # symfony
@@ -392,7 +402,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \
@@ -406,8 +416,10 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \
 	&& photon --version | grep -E 'Installer [.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
@@ -432,10 +444,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/Dockerfile-7.1

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x jessie main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -155,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -274,13 +278,17 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# php-cs-fixer
+	&& curl -sS -L https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+&& chmod +x /usr/local/bin/php-cs-fixer \
+ \
 # phpunit
 	&& curl -qL https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \
 && chmod +x /usr/local/bin/phpunit \
@@ -289,6 +297,8 @@ RUN set -x \
 	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
 && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # symfony
@@ -392,7 +402,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \
@@ -406,8 +416,10 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \
 	&& photon --version | grep -E 'Installer [.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
@@ -432,10 +444,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/Dockerfile-7.2

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -155,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -274,13 +278,17 @@ RUN set -x \
 && rm -rf /usr/local/src/phalcon-devtools/.git \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# php-cs-fixer
+	&& curl -sS -L https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+&& chmod +x /usr/local/bin/php-cs-fixer \
+ \
 # phpunit
 	&& curl -qL https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \
 && chmod +x /usr/local/bin/phpunit \
@@ -289,6 +297,8 @@ RUN set -x \
 	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
 && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # symfony
@@ -392,7 +402,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \
@@ -406,8 +416,10 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \
 	&& photon --version | grep -E 'Installer [.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
@@ -432,10 +444,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/Dockerfile-7.3

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -155,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -263,13 +267,17 @@ RUN set -x \
 && rm -rf /usr/local/src/mysqldump-secure \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
+# php-cs-fixer
+	&& curl -sS -L https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+&& chmod +x /usr/local/bin/php-cs-fixer \
+ \
 # phpunit
 	&& curl -qL https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \
 && chmod +x /usr/local/bin/phpunit \
@@ -278,6 +286,8 @@ RUN set -x \
 	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
 && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # symfony
@@ -381,7 +391,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \
@@ -394,8 +404,10 @@ RUN set -x \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \
 	&& photon --version | grep -E 'Installer [.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
@@ -420,10 +432,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/Dockerfile-7.4

@@ -27,18 +27,21 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
+	&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
 	&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main" > /etc/apt/sources.list.d/git.list \
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add - \
+	&& curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/node.list \
-	&& curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add - \
+	&& curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -48,10 +51,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -106,6 +109,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -155,7 +159,7 @@ RUN set -x \
 && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/codecept \
  \
 # deployer
-	&& curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 # drush7
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush7 \
@@ -263,11 +267,11 @@ RUN set -x \
 && rm -rf /usr/local/src/mysqldump-secure \
  \
 # phpcs
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
 && chmod +x /usr/local/bin/phpcs \
  \
 # phpcbf
-	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
  \
 # phpunit
@@ -278,6 +282,8 @@ RUN set -x \
 	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
 && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
  \
+# pm2
+	&& until npm install pm2 -g; do sleep 1; done \
 # sass
 	&& gem install sass \
 # symfony
@@ -381,7 +387,7 @@ RUN set -x \
 && gulp --version | grep -E '[.0-9]+' \
  \
 	&& codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$' \
-	&& dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+' \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
 	&& drush8 --version | grep -E '8[.0-9]+\s*$' \
 	&& drush9 --version | grep -E '9[.0-9]+\s*$' \
@@ -396,6 +402,7 @@ RUN set -x \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
 	&& phpunit --version | grep -iE '^PHPUnit\s[.0-9]+' \
 	&& photon --version | grep -E 'Installer [.0-9]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
@@ -420,10 +427,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

Dockerfiles/work/data/bash-devilbox

@@ -27,42 +27,33 @@ PS1="${_clr_usr}${PS1_USR}${_clr_off}@${_clr_ver}php-${PS1_PHP}${_clr_off} in ${
 
 # Show Intro
 echo
-echo "--------------------------------------------------------------------------------"
-echo "                         _            _ _ _               "
-echo "                        | |          (_) | |              "
-echo "                      __| | _____   ___| | |__   _____  __"
-echo "                     / _\` |/ _ \\ \\ / / | | '_ \\ / _ \\ \\/ /"
-echo "                    | (_| |  __/\\ V /| | | |_) | (_) >  < "
-echo "                     \\__,_|\\___| \\_/ |_|_|_.__/ \\___/_/\\_\\"
-echo "                                                          "
-echo "                             http://devilbox.org"
+echo "------------------------------------------------------------------------------------------"
+echo "                              _            _ _ _               "
+echo "                             | |          (_) | |              "
+echo "                           __| | _____   ___| | |__   _____  __"
+echo "                          / _\` |/ _ \\ \\ / / | | '_ \\ / _ \\ \\/ /"
+echo "                         | (_| |  __/\\ V /| | | |_) | (_) >  < "
+echo "                          \\__,_|\\___| \\_/ |_|_|_.__/ \\___/_/\\_\\"
+echo "                                                               "
+echo "                                  http://devilbox.org"
+echo "                            https://devilbox.readthedocs.io"
 echo
 echo
-echo "              | Available Tools  | Project website              |"
-echo "              |------------------|------------------------------|"
-echo "              | awesome-ci       | gh: cytopia/awesome-ci       |"
-echo "              | composer         | https://getcomposer.org      |"
-echo "              | drupal-console   | https://drupalconsole.com    |"
-echo "              | drush            | http://www.drush.org         |"
-echo "              | eslint           | https://eslint.org           |"
-echo "              | git              | https://git-scm.com          |"
-echo "              | laravel          | gh: laravel/installer        |"
-echo "              | linuxbrew        | http://linuxbrew.sh          |"
-echo "              | mysqldump-secure | https://mysqldump-secure.org |"
-echo "              | node             | https://nodejs.org           |"
-echo "              | npm              | https://www.npmjs.com        |"
-echo "              | phalcon-devtools | gh: phalcon/phalcon-devtools |"
-echo "              | symfony installer| gh: symfony/symfony-installer|"
-echo "              | webpack          | gh: webpack/webpack          |"
-echo "              | wpcli            | https://wp-cli.org           |"
+echo
+echo "                                    Available Tools"
+echo "          https://devilbox.readthedocs.io/en/latest/readings/available-tools.html"
+echo
+echo "                           How to work inside this PHP container"
+echo " https://devilbox.readthedocs.io/en/latest/intermediate/work-inside-the-php-container.html"
 echo
 echo
-echo "              | Available Dirs   | Description                  |"
-echo "              |------------------|------------------------------|"
-echo "              | /shared/httpd    | Project base directory       |"
-echo "              | /shared/backups  | Backup directory             |"
-echo "              | /var/mail        | Email directory              |"
-echo "              | /var/log         | Log file directory           |"
 echo
-echo "--------------------------------------------------------------------------------"
+echo "                    | Available Dirs   | Description                  |"
+echo "                    |------------------|------------------------------|"
+echo "                    | /shared/httpd    | Project base directory       |"
+echo "                    | /shared/backups  | Backup directory             |"
+echo "                    | /var/mail        | Email directory              |"
+echo "                    | /var/log         | Log file directory           |"
+echo
+echo "------------------------------------------------------------------------------------------"
 echo

Dockerfiles/work/data/docker-entrypoint.sh

@@ -16,38 +16,38 @@ set -p pipefail
 #   MY_GID
 
 # Path to scripts to source
-CONFIG_DIR="/docker-entrypoint.d"
+DVL_CONFIG_DIR="/docker-entrypoint.d"
 
 # php.ini.d directory
-PHP_INI_DIR="/usr/local/etc/php/conf.d"
+DVL_PHP_INI_DIR="/usr/local/etc/php/conf.d"
 
 # php-fpm conf.d directory
-PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
+DVL_PHP_FPM_DIR="/usr/local/etc/php-fpm.d"
 
 # This is the log file for any mail related functions
-PHP_MAIL_LOG="/var/log/mail.log"
+DVL_PHP_MAIL_LOG="/var/log/mail.log"
 
 # This file holds error and access log definitions
-PHP_FPM_CONF_LOGFILE="${PHP_FPM_DIR}/zzz-entrypoint-logfiles.conf"
-PHP_INI_CONF_LOGFILE="${PHP_INI_DIR}/zzz-entrypoint-logfiles.ini"
+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"
 
 # PHP-FPM log dir
-FPM_LOG_DIR="/var/log/php"
+DVL_FPM_LOG_DIR="/var/log/php"
 
 # Custom ini dir (to be copied to actual ini dir)
-PHP_CUST_INI_DIR="/etc/php-custom.d"
+DVL_PHP_CUST_INI_DIR="/etc/php-custom.d"
 
 # Custom PHP-FPM dir (to be copied to actual FPM conf dir)
-PHP_CUST_FPM_DIR="/etc/php-fpm-custom.d"
+DVL_PHP_CUST_FPM_DIR="/etc/php-fpm-custom.d"
 
 # Supervisord config directory
-SUPERVISOR_CONFD="/etc/supervisor/conf.d"
+DVL_SUPERVISOR_CONFD="/etc/supervisor/conf.d"
 
 
 ###
 ### Source libs
 ###
-init="$( find "${CONFIG_DIR}" -name '*.sh' -type f | sort -u )"
+init="$( find "${DVL_CONFIG_DIR}" -name '*.sh' -type f | sort -u )"
 for f in ${init}; do
 	# shellcheck disable=SC1090
 	. "${f}"
@@ -76,7 +76,7 @@ set_gid "NEW_GID" "${MY_GROUP}" "/home/${MY_USER}" "${DEBUG_LEVEL}"
 ###
 ### Set timezone
 ###
-set_timezone "TIMEZONE" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
+set_timezone "TIMEZONE" "${DVL_PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
@@ -92,9 +92,9 @@ fi
 ###
 set_docker_logs \
 	"DOCKER_LOGS" \
-	"${FPM_LOG_DIR}" \
-	"${PHP_FPM_CONF_LOGFILE}" \
-	"${PHP_INI_CONF_LOGFILE}" \
+	"${DVL_FPM_LOG_DIR}" \
+	"${DVL_PHP_FPM_CONF_LOGFILE}" \
+	"${DVL_PHP_INI_CONF_LOGFILE}" \
 	"${MY_USER}" \
 	"${MY_GROUP}" \
 	"${DEBUG_LEVEL}"
@@ -105,10 +105,10 @@ set_docker_logs \
 ###
 if is_docker_logs_enabled "DOCKER_LOGS" >/dev/null; then
 	# PHP mail function should log to stderr
-	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${PHP_INI_DIR}" "/proc/self/fd/2" "1" "${DEBUG_LEVEL}"
+	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${DVL_PHP_INI_DIR}" "/proc/self/fd/2" "1" "${DEBUG_LEVEL}"
 else
 	# PHP mail function should log to file
-	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${PHP_INI_DIR}" "${PHP_MAIL_LOG}" "0" "${DEBUG_LEVEL}"
+	set_postfix "ENABLE_MAIL" "${MY_USER}" "${MY_GROUP}" "${DVL_PHP_INI_DIR}" "${DVL_PHP_MAIL_LOG}" "0" "${DEBUG_LEVEL}"
 fi
 
 
@@ -130,7 +130,7 @@ for line in $( port_forward_get_lines "FORWARD_PORTS_TO_LOCALHOST" ); do
 	supervisor_add_service \
 		"socat-${lport}-${rhost}-${rport}" \
 		"/usr/bin/socat tcp-listen:${lport},reuseaddr,fork tcp:${rhost}:${rport}" \
-		"${SUPERVISOR_CONFD}" \
+		"${DVL_SUPERVISOR_CONFD}" \
 		"${DEBUG_LEVEL}"
 done
 
@@ -139,30 +139,30 @@ done
 ### Supervisor: rsyslogd & postfix
 ###
 if [ "$( env_get "ENABLE_MAIL" )" = "1" ]; then
-	supervisor_add_service "rsyslogd" "/usr/sbin/rsyslogd -n"      "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}" "1"
-	supervisor_add_service "postfix"  "/usr/local/sbin/postfix.sh" "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
+	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
 
 
 ###
 ### Supervisor: php-fpm
 ###
-supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
+supervisor_add_service "php-fpm"  "/usr/local/sbin/php-fpm" "${DVL_SUPERVISOR_CONFD}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Copy custom *.ini files
 ###
-copy_ini_files "${PHP_CUST_INI_DIR}" "${PHP_INI_DIR}" "${DEBUG_LEVEL}"
+copy_ini_files "${DVL_PHP_CUST_INI_DIR}" "${DVL_PHP_INI_DIR}" "${DEBUG_LEVEL}"
 
 
 ###
 ### Copy custom PHP-FPM *.conf files
 ###
 if [ "${PHP_VERSION}" = "5.2" ]; then
-	copy_fpm_5_2_conf_file "${PHP_CUST_FPM_DIR}/php-fpm.xml" "${DEBUG_LEVEL}"
+	copy_fpm_5_2_conf_file "${DVL_PHP_CUST_FPM_DIR}/php-fpm.xml" "${DEBUG_LEVEL}"
 else
-copy_fpm_files "${PHP_CUST_FPM_DIR}" "${PHP_FPM_DIR}" "${DEBUG_LEVEL}"
+copy_fpm_files "${DVL_PHP_CUST_FPM_DIR}" "${DVL_PHP_FPM_DIR}" "${DEBUG_LEVEL}"
 fi
 
 
@@ -206,6 +206,13 @@ run "chmod 0755 /shared/httpd" "${DEBUG_LEVEL}"
 update_ca_certificates "/ca" "${DEBUG_LEVEL}"
 
 
+###
+### Run custom user supplied scripts
+###
+execute_custom_scripts "/startup.1.d" "${DEBUG_LEVEL}"
+execute_custom_scripts "/startup.2.d" "${DEBUG_LEVEL}"
+
+
 ###
 ### Startup
 ###

README.md

@@ -526,52 +526,52 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>5.2</th>
    <td id="52-base">ctype, curl, date, dom, filter, hash, iconv, json, libxml, mbstring, mysql, mysqli, openssl, pcre, PDO, pdo_mysql, pdo_sqlite, posix, readline, Reflection, session, SimpleXML, soap, SPL, SQLite, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="52-mods">amqp, bcmath, bz2, calendar, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="52-mods">amqp, bcmath, bz2, calendar, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, hash, iconv, igbinary, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>5.3</th>
    <td id="53-base">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</td>
-   <td id="53-mods">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</td>
+   <td id="53-mods">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, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, oci8, 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</td>
   </tr>
   <tr>
    <th>5.4</th>
    <td id="54-base">Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="54-mods">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, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="54-mods">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, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, oci8, 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, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>5.5</th>
    <td id="55-base">Core, ctype, curl, date, dom, ereg, 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="55-mods">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, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="55-mods">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, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, oci8, 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, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>5.6</th>
    <td id="56-base">Core, ctype, curl, date, dom, ereg, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mhash, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="56-mods">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, mhash, 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, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="56-mods">amqp, apc, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mhash, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, oci8, 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, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <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, 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, SPL, sqlite3, 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, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, 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>
   </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, 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, SPL, sqlite3, 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, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, 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>
   </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, 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</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, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, 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>
   </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">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, memcached, mongodb, 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, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="73-mods">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, json, ldap, libxml, mbstring, memcached, mongodb, msgpack, mysqli, mysqlnd, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, 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>
   </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">bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, memcached, mongodb, 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, sodium, SPL, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="74-mods">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</td>
   </tr>
  </tbody>
 </table>
@@ -701,7 +701,7 @@ Have a look at the following table to see all supported environment variables fo
    <td><code>ENABLE_MODULES</code></td>
    <td>string</td>
    <td><code>''</code></td>
-   <td>Comma separated list of PHP modules to enable, which are not enabled by default.<br/><strong>Example:</strong><br/><code>ENABLE_MODULES=ioncube</code></td>
+   <td>Comma separated list of PHP modules to enable, which are not enabled by default.<br/><strong>Example:</strong><br/><code>ENABLE_MODULES=blackfire, ioncube</code></td>
   </tr>
   <tr>
    <td><code>DISABLE_MODULES</code></td>
@@ -760,7 +760,7 @@ Have a look at the following table to see all offered volumes for each Docker im
  </thead>
  <tbody>
   <tr>
-   <td rowspan="5"><strong>prod</strong><br/><br/><strong>work</strong></td>
+   <td rowspan="7"><strong>prod</strong><br/><br/><strong>work</strong></td>
    <td><code>/etc/php-custom.d</code></td>
    <td>Mount this directory into your host computer and add custom <code>\*.ini</code> files in order to alter php behaviour.</td>
   </tr>
@@ -772,6 +772,14 @@ Have a look at the following table to see all offered volumes for each Docker im
    <td><code>/etc/php-modules.d</code></td>
    <td>Mount this directory into your host computer and add custo <code>\*.so</code> files in order to add your php modules.<br/><br/><strong>Note:</strong>Your should then also provide a custom <code>\*.ini</code> file in order to actually load your custom provided module.</td>
   </tr>
+  <tr>
+   <td><code>/startup.1.d</code></td>
+   <td>Any executable scripts ending by <code>\*.sh</code> found in this directory will be executed during startup. This is useful to supply additional commands (such as installing custom software) when the container starts up. (will run before <code>/startup.2.d</code>)</td>
+  </tr>
+  <tr>
+   <td><code>/startup.2.d</code></td>
+   <td>Any executable scripts ending by <code>\*.sh</code> found in this directory will be executed during startup. This is useful to supply additional commands (such as installing custom software) when the container starts up. (will run after <code>/startup.1.d</code>)</td>
+  </tr>
   <tr>
    <td><code>/var/log/php</code></td>
    <td>When setting environment variable <code>DOCKER_LOGS</code> to <code>0</code>, log files will be available under this directory.</td>
@@ -959,6 +967,10 @@ You want to use tools such as `git`, `drush`, `composer`, `npm`, `eslint`, `phpc
    <td><a href="https://github.com/squizlabs/PHP_CodeSniffer">phpcbf</a></td>
    <td>PHP Code Beautifier and Fixer.</td>
   </tr>
+  <tr>
+   <td><a href="https://github.com/FriendsOfPHP/PHP-CS-Fixer">php-cs-fixer</a></td>
+   <td>A tool to automatically fix PHP Coding Standards issues.</td>
+  </tr>
   <tr>
    <td><a href="https://photoncms.com/resources/installing">photon</a></td>
    <td>Photon CMS cli.</td>

build/ansible/DOCKERFILES/Dockerfile-mods.j2

@@ -182,6 +182,11 @@ RUN set -x \
 {%		endif %}
 {%	endif %}
 {% endfor %}
+{# Fix php.ini settings for enabled extensions #}
+	&& if [ -f /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini ]; then \
+			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
+		fi \
+{# /Fix php.ini settings for enabled extensions #}
 	&& chmod +x "$(php -r 'echo ini_get("extension_dir");')"/* \
 	&& rm -rf /tmp/* \
 	\
@@ -225,7 +230,10 @@ RUN set -x \
 	&& php -m | grep -oiE '^Zend Opcache$' \
 	&& php-fpm -m | grep -oiE '^Zend Opcache$' \
 {# #}
-		{%- elif ext not in ['ioncube'] %}
+		{%- elif ext == 'readline' %}
+	&& php -m | grep -oiE '^readline$' \
+{# #}
+		{%- elif ext not in ['blackfire', 'ioncube'] %}
 	&& php -m | grep -oiE '^{{ ext }}$' \
 	&& php-fpm -m | grep -oiE '^{{ ext }}$' \
 {# #}

build/ansible/DOCKERFILES/Dockerfile-prod.j2

@@ -24,6 +24,7 @@ RUN set -x \
 		locales-all \
 		postfix \
 		postfix-pcre \
+		cron \
 		rsyslog \
 		socat \
 		supervisor \
@@ -74,9 +75,6 @@ COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
 ###
 ### Volumes
 ###
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /var/log/php
 VOLUME /var/mail
 

build/ansible/DOCKERFILES/Dockerfile-work.j2

@@ -27,6 +27,7 @@ RUN set -x \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 	&& 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 \
+		curl \
 		dirmngr \
 		gnupg \
 {% for repo in apt_repositories_enabled -%}
@@ -43,11 +44,11 @@ RUN set -x \
 		{%- endif -%}
 		{#- Version specific key available? -#}
 		{%- if php_version in apt_repositories_available[repo] and 'key' in apt_repositories_available[repo][php_version] %}
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo][php_version]['key'] }} \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo][php_version]['key'] }} \
 {# #}
 		{#- Generic key available? -#}
 		{%- elif 'all' in apt_repositories_available[repo] and 'key' in apt_repositories_available[repo]['all'] %}
-	&& apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo]['all']['key'] }} \
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv {{ apt_repositories_available[repo]['all']['key'] }} \
 {# #}
 		{%- endif -%}
 		{#- Version specific repository available? -#}
@@ -69,10 +70,10 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
-		curl \
 		dnsutils \
 		dos2unix \
 		file \
@@ -127,6 +128,7 @@ RUN set -x \
 		wkhtmltopdf \
 		xz-utils \
 		yarn \
+		zip \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
@@ -246,10 +248,6 @@ COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
 ###
 ### Volumes
 ###
-VOLUME /etc/bashrc-devilbox.d
-VOLUME /etc/php-custom.d
-VOLUME /etc/php-fpm-custom.d
-VOLUME /etc/php-modules.d
 VOLUME /shared/backups
 VOLUME /var/log/php
 VOLUME /var/mail

build/ansible/group_vars/all.yml

@@ -185,6 +185,7 @@ compose_home: /usr/local/src/composer
 ###
 apt_repositories_enabled:
   - backports
+  - blackfire
   - git
   - mongo
   - node
@@ -218,8 +219,10 @@ software_enabled:
   - phalcon
   - phpcs
   - phpcbf
+  - php-cs-fixer
   - phpunit
   - photon
+  - pm2
   - sass
   - symfony
   - webpack
@@ -245,6 +248,10 @@ apt_repositories_available:
   backports:
     all:
       deb: deb http://ftp.debian.org/debian jessie-backports main
+  blackfire:
+    all:
+      deb: deb http://packages.blackfire.io/debian any main
+      pre: curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
   git:
     7.2:
       deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
@@ -268,7 +275,7 @@ apt_repositories_available:
       deb: deb http://deb.nodesource.com/node_8.x stretch main
     all:
       deb: deb http://deb.nodesource.com/node_8.x jessie main
-      pre: curl -q "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | apt-key add -
+      pre: curl -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
   pgsql:
     7.2:
       deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
@@ -278,11 +285,11 @@ apt_repositories_available:
       deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
     all:
       deb: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main
-      pre: curl -q https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | apt-key add -
+      pre: curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
   yarn:
     all:
       deb: deb http://dl.yarnpkg.com/debian/ stable main
-      pre: curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+      pre: curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
 
 
 ###
@@ -347,9 +354,18 @@ software_available:
       command: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
   deployer:
     disabled: [5.2, 5.3]
-    check: dep --version 2>/dev/null | grep -E 'Deployer\s*[.0-9]+'
+    check: dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+'
+    5.4:
+      command: curl -sS https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep
+      post: chmod +x /usr/local/bin/dep
+    5.5:
+      command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
+      post: chmod +x /usr/local/bin/dep
+    5.6:
+      command: curl -sS https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
+      post: chmod +x /usr/local/bin/dep
     all:
-      command: curl https://deployer.org/deployer.phar -L -o /usr/local/bin/dep
+      command: curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep
       post: chmod +x /usr/local/bin/dep
   drush7:
     disabled: [5.2]
@@ -537,30 +553,49 @@ software_available:
     check: phpcs --version | grep -E 'version [.0-9]+'
     5.2:
       command: |
-        curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+        curl -sS -L https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
         && chmod +x /usr/local/bin/phpcs \
     5.3:
       command: |
-        curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+        curl -sS -L https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
         && chmod +x /usr/local/bin/phpcs \
     all:
       command: |
-        curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+        curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
         && chmod +x /usr/local/bin/phpcs \
   phpcbf:
     check: phpcbf --version | grep -E 'version [.0-9]+'
     5.2:
       command: |
-        curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+        curl -sS -L https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
         && chmod +x /usr/local/bin/phpcbf \
     5.3:
       command: |
-        curl -qL https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+        curl -sS -L https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
         && chmod +x /usr/local/bin/phpcbf \
     all:
       command: |
-        curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+        curl -sS -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
         && chmod +x /usr/local/bin/phpcbf \
+  php-cs-fixer:
+    disabled: [5.2, 7.4]
+    check: php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+'
+    5.3:
+      command: |
+        curl -sS -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+        && chmod +x /usr/local/bin/php-cs-fixer \
+    5.4:
+      command: |
+        curl -sS -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+        && chmod +x /usr/local/bin/php-cs-fixer \
+    5.5:
+      command: |
+        curl -sS -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+        && chmod +x /usr/local/bin/php-cs-fixer \
+    all:
+      command: |
+        curl -sS -L https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+        && chmod +x /usr/local/bin/php-cs-fixer \
   phpunit:
     disabled: [5.2]
     check: phpunit --version | grep -iE '^PHPUnit\s[.0-9]+'
@@ -595,6 +630,11 @@ software_available:
       command: |
         COMPOSER_HOME="{{ compose_home }}" composer global require "photoncms/installer" \
         && ln -s {{ compose_home }}/vendor/photoncms/installer/photon /usr/local/bin/photon \
+  # https://github.com/Unitech/pm2
+  pm2:
+    check: pm2 --no-daemon --version | grep -E '[.0-9]+'
+    all:
+      command: until npm install pm2 -g; do sleep 1; done
   sass:
     check: sass --version | grep -E '[.0-9]+'
     all:
@@ -670,6 +710,7 @@ extensions_enabled:
   - amqp
   - apcu
   - bcmath
+  - blackfire
   - bz2
   - calendar
   - ctype
@@ -678,6 +719,7 @@ extensions_enabled:
   - dom
   - enchant
   - exif
+  - ffi
   - fileinfo
   - filter
   - ftp
@@ -696,11 +738,12 @@ extensions_enabled:
   - libxml
   - mbstring
   - mcrypt
+  - msgpack
   - memcache
+  # requires igbinary and msgpack to be installed
   - memcached
   - mongo
   - mongodb
-  - msgpack
   - mysql
   - mysqli
   - mysqlnd
@@ -718,6 +761,7 @@ extensions_enabled:
   - pdo_odbc
   - pdo_pgsql
   - pdo_sqlite
+  - pdo_sqlsrv
   - pgsql
   - phalcon
   - phar
@@ -736,6 +780,7 @@ extensions_enabled:
   - sockets
   - sodium
   - spl
+  - sqlsrv
   - swoole
   - sysvmsg
   - sysvsem
@@ -788,10 +833,16 @@ extensions_available:
       type: pecl
       version: 1.4.0
     5.3:
+      type: pecl
+      version: 1.9.3
       run_dep: [librabbitmq1]
     5.4:
+      type: pecl
+      version: 1.9.3
       run_dep: [librabbitmq1]
     5.5:
+      type: pecl
+      version: 1.9.3
       run_dep: [librabbitmq1]
     all:
       type: pecl
@@ -817,6 +868,17 @@ extensions_available:
   bcmath:
     all:
       type: builtin
+  blackfire:
+    disabled: [5.2, 5.3, 5.4, 5.5, 7.4]
+    all:
+      type: custom
+      command: |
+        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 \
   bz2:
     all:
       type: builtin
@@ -825,23 +887,14 @@ extensions_available:
     all:
       type: builtin
   ctype:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
+    already_avail: "{{ php_all_versions }}"
   curl:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
-      build_dep: [libcurl4-openssl-dev]
+    already_avail: "{{ php_all_versions }}"
   dba:
     all:
       type: builtin
   dom:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
-      configure: --with-libxml-dir=/usr
-      build_dep: [libxml2-dev]
+    already_avail: "{{ php_all_versions }}"
   enchant:
     5.2:
       type: pecl
@@ -853,6 +906,18 @@ extensions_available:
   exif:
     all:
       type: builtin
+  ffi:
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3]
+    all:
+      type: git
+      git_url: https://github.com/dstogov/php-ffi
+      command: |
+        phpize \
+        && ./configure --with-ffi \
+        && make -j$(getconf _NPROCESSORS_ONLN) \
+        && make install \
+      build_dep: [libffi-dev]
+      run_dep: [libffi6]
   fileinfo:
     already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
     5.2:
@@ -933,13 +998,9 @@ extensions_available:
       pre: ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/
       build_dep: [libgmp-dev]
   hash:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
+    already_avail: "{{ php_all_versions }}"
   iconv:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
+    already_avail: "{{ php_all_versions }}"
   igbinary:
     5.2:
       type: pecl
@@ -963,6 +1024,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/
@@ -1006,12 +1069,7 @@ extensions_available:
         && rm -rf ioncube \
         && rm -rf ioncube.tar.gz \
   json:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    7.0:
-      type: builtin
-      build_dep: [bison]
-    all:
-      type: builtin
+    already_avail: "{{ php_all_versions }}"
   ldap:
     all:
       type: builtin
@@ -1069,11 +1127,6 @@ extensions_available:
     5.6:
       type: pecl
       version: 2.2.0
-    7.3:
-      type: git
-      git_url: https://github.com/php-memcached-dev/php-memcached
-      git_ref: master
-      command: phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install
     7.4:
       type: git
       git_url: https://github.com/php-memcached-dev/php-memcached
@@ -1081,7 +1134,8 @@ extensions_available:
       command: phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install
     all:
       type: pecl
-      build_dep: [zlib1g-dev, libmemcached-dev]
+      #version: 3.0.4 # TODO: check if this version works
+      build_dep: [zlib1g-dev, libmemcached-dev, libevent-dev]
       run_dep: [libmemcachedutil2]
   mongo:
     disabled: [7.0, 7.1, 7.2, 7.3, 7.4] # Deprecated
@@ -1104,7 +1158,7 @@ extensions_available:
       type: pecl
       build_dep: [libssl-dev, libsasl2-dev]
   msgpack:
-    disabled: [7.3, 7.4]
+    disabled: [7.4]
     5.2:
       type: pecl
       version: 0.5.7
@@ -1139,7 +1193,23 @@ 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]
   oci8:
-    disabled: "{{ php_all_versions }}" # TODO: Oracle library is missing
+    disabled: [5.2]
+    all:
+      type: builtin
+      configure: --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3
+      pre: |
+        rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+        && curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+          https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+        && curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+          https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+        && alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+        && alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+        && rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+        && rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+        && (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+      build_dep: [alien, libaio-dev]
+      run_dep: [libaio1]
   odbc:
     disabled: "{{ php_all_versions }}" # TODO: sqlext.h' not found!
   opcache:
@@ -1155,18 +1225,14 @@ extensions_available:
     all:
       type: builtin
   openssl:
-    already_avail: "{{ php_all_versions }}" # Available by default
+    already_avail: "{{ php_all_versions }}"
   pcntl:
     all:
       type: builtin
   pcre:
-    already_avail: "{{ php_all_versions }}" # Available by default
+    already_avail: "{{ php_all_versions }}"
   pdo:
-    # https://github.com/docker-library/php/issues/618
-    #disabled: [7.0] # TODO: Currently disabled due to bug in built
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
+    already_avail: "{{ php_all_versions }}"
   pdo_dblib:
     all:
       type: builtin
@@ -1185,10 +1251,31 @@ extensions_available:
       configure: --with-zlib-dir=/usr
       build_dep: [zlib1g-dev]
   pdo_oci:
-    disabled: "{{ php_all_versions }}" # TODO: Oracle library is missing
-    #    disabled: [5.2]
-    #    all:
-    #      type: builtin
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6]
+    7.4:
+      type: builtin
+      configure: --with-pdo-oci=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3
+    7.3:
+      type: builtin
+      configure: --with-pdo-oci=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3
+    7.2:
+      type: builtin
+      configure: --with-pdo-oci=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3
+    all:
+      type: builtin
+      configure: --with-pdo-oci=instantclient,/usr,18.3
+      pre: |
+        rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
+        && curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+          https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+        && curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+          https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+        && alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+        && alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+        && rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
+        && rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
+        && (ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true) \
+      build_dep: [alien]
   pdo_odbc:
     disabled: "{{ php_all_versions }}" # TODO: Build errors
   pdo_pgsql:
@@ -1197,17 +1284,25 @@ extensions_available:
       build_dep: [libpq-dev]
       run_dep: [libpq5]
   pdo_sqlite:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
+    already_avail: "{{ php_all_versions }}"
+  pdo_sqlsrv:
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4]
+    7.3:
+      type: pecl
+      version: 5.5.0preview
+      build_dep: [unixodbc-dev]
+      run_dep: [unixodbc]
     all:
-      type: builtin
-      build_dep: [libsqlite3-dev]
+      type: pecl
+      build_dep: [unixodbc-dev]
+      run_dep: [unixodbc]
   pgsql:
     all:
       type: builtin
       build_dep: [libpq-dev]
       run_dep: [libpq5]
   phalcon:
-    disabled: [5.2, 7.3, 7.4]
+    disabled: [5.2, 7.4]
     5.3:
       type: git
       git_url: https://github.com/phalcon/cphalcon
@@ -1218,41 +1313,45 @@ extensions_available:
       git_url: https://github.com/phalcon/cphalcon
       git_ref: phalcon-v2.0.13
       command: cd build && ./install
-#    7.3:
-#      type: git
-#      git_url: https://github.com/phalcon/cphalcon
-#      git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g')
-#      # TODO: Workaround to make it compile on PHP 7.3
-#      command: cd build && echo > php7/64bits/phalcon.zep.c && ./install
+    5.5:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v3.4.2
+      command: cd build && ./install
+    5.6:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v3.4.2
+      command: cd build && ./install
+    7.0:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v3.4.2
+      command: cd build && ./install
+    7.1:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: v3.4.2
+      command: cd build && ./install
     all:
       type: git
       git_url: https://github.com/phalcon/cphalcon
-      git_ref: $(git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | tail -1 | sed 's/^.*tags\///g')
+      git_ref: $(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)
       command: cd build && ./install
   phar:
-    # https://github.com/docker-library/php/issues/618
-    disabled: [5.6, 7.0] # TODO: Currently disabled due to bug in built
-    already_avail: [5.3, 5.4, 5.5, 7.1, 7.2, 7.3, 7.4]
+    already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
     5.2:
       type: pecl
-    all:
-      type: builtin
       build_dep: [libssl-dev]
   posix:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
+    already_avail: "{{ php_all_versions }}"
   pspell:
     all:
       type: builtin
       build_dep: [libpspell-dev]
       run_dep: [libaspell15]
   readline:
-    disabled: [5.3]
-    already_avail: [5.2, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
-      build_dep: [libedit-dev, libreadline-dev]
+    already_avail: "{{ php_all_versions }}"
   recode:
     already_avail: [5.3, 5.4]
     all:
@@ -1286,20 +1385,12 @@ extensions_available:
       build_dep: [librdkafka-dev]
       run_dep: [librdkafka1]
   session:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
-      configure: --with-mm
-      build_dep: [libmm-dev]
+    already_avail: "{{ php_all_versions }}"
   shmop:
     all:
       type: builtin
   simplexml:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
-      configure: --with-libxml-dir=/usr
-      build_dep: [libxml2-dev]
+    already_avail: "{{ php_all_versions }}"
   snmp:
     all:
       type: builtin
@@ -1322,7 +1413,18 @@ extensions_available:
       type: builtin
       build_dep: [libsodium-dev]
   spl:
-    disabled: "{{ php_all_versions }}" # TODO: Did not work
+    already_avail: "{{ php_all_versions }}"
+  sqlsrv:
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4]
+    7.3:
+      type: pecl
+      version: 5.5.0preview
+      build_dep: [unixodbc-dev]
+      run_dep: [unixodbc]
+    all:
+      type: pecl
+      build_dep: [unixodbc-dev]
+      run_dep: [unixodbc]
   swoole:
     disabled: [5.2]
     5.3:
@@ -1405,9 +1507,7 @@ extensions_available:
       build_dep: [libtidy-dev]
       run_dep: [libtidy5]
   tokenizer:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
+    already_avail: "{{ php_all_versions }}"
   uploadprogress:
     7.0:
       type: git
@@ -1459,28 +1559,16 @@ extensions_available:
     all:
       type: pecl
   xml:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
-      configure: --with-libxml-dir=/usr
-      build_dep: [libxml2-dev]
+    already_avail: "{{ php_all_versions }}"
   xmlreader:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
-      configure: --with-libxml-dir=/usr
-      build_dep: [libxml2-dev]
+    already_avail: "{{ php_all_versions }}"
   xmlrpc:
     all:
       type: builtin
       configure: --with-libxml-dir=/usr --with-iconv-dir=/usr
       build_dep: [libxml2-dev]
   xmlwriter:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
-    all:
-      type: builtin
-      configure: --with-libxml-dir=/usr
-      build_dep: [libxml2-dev]
+    already_avail: "{{ php_all_versions }}"
   xsl:
     all:
       type: builtin

build/gen-readme.sh

@@ -35,13 +35,30 @@ get_modules() {
 
 	# Retrieve all modules
 	PHP_MODULES="$( docker run -it --entrypoint=php devilbox/php-fpm:${tag} -m )"
+	ALL_MODULES=
+
+	if docker run -it --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'ioncube.so' | grep -q ioncube.so; then
+		ALL_MODULES="${ALL_MODULES},ioncube";
+	fi
+
+	if docker run -it --entrypoint=find devilbox/php-fpm:${tag} /usr/local/lib/php/extensions -name 'blackfire.so' | grep -q blackfire.so; then
+		ALL_MODULES="${ALL_MODULES},blackfire";
+	fi
 
 	# Process module string into correct format for README.md
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed 's/^\[.*//g' )" # Remove PHP Modules headlines
+	PHP_MODULES="${ALL_MODULES}${PHP_MODULES}"                  # Append all available modules
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sort -fu )"         # Unique
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed '/^\s*$/d' )"   # Remove empty lines
 	PHP_MODULES="$( echo "${PHP_MODULES}" | tr '\r\n' ',' )"    # Newlines to commas
+	PHP_MODULES="$( echo "${PHP_MODULES}" | tr '\n' ',' )"      # Newlines to commas
+	PHP_MODULES="$( echo "${PHP_MODULES}" | tr '\r' ',' )"      # Newlines to commas
+	PHP_MODULES="$( echo "${PHP_MODULES}" | sed	's/^M/,/g' )"   # Newlines to commas
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed 's/,,/,/g' )"   # Remove PHP Modules headlines
+	PHP_MODULES="$( echo "${PHP_MODULES}" | sed 's/,/\n/g' )"   # Back to newlines
+	PHP_MODULES="$( echo "${PHP_MODULES}" | sort -fu )"         # Unique
+	PHP_MODULES="$( echo "${PHP_MODULES}" | sed '/^\s*$/d' )"   # Remove empty lines
+	PHP_MODULES="$( echo "${PHP_MODULES}" | tr '\n' ',' )"      # Newlines to commas
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed 's/,$//g' )"    # Remove trailing comma
 	PHP_MODULES="$( echo "${PHP_MODULES}" | sed 's/,/, /g' )"   # Add space to comma
 

tests/base/04-test-run_nginx.sh

@@ -38,7 +38,7 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull Image
-run "docker pull ${CONTAINER}"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
 did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT}" )"

tests/prod/05-test-env-forward_ports_to_localhost.sh

@@ -25,7 +25,7 @@ FLAVOUR="${3}"
 CONTAINER="mysql:5.6"
 
 # Pull Container
-run "docker pull ${CONTAINER}"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start mysql container
 mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ALLOW_EMPTY_PASSWORD=yes" )"

tests/prod/06-test-mount-custom_ini.sh

@@ -44,7 +44,7 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull container
-run "docker pull ${CONTAINER}"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
 did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_INI_HOST}:${PHP_INI_CONT}" )"

tests/prod/07-test-mount-custom_fpm_conf.sh

@@ -49,7 +49,7 @@ chmod 0777 "${DOC_ROOT_HOST}"
 chmod 0644 "${DOC_ROOT_HOST}/index.php"
 
 # Pull container
-run "docker pull ${CONTAINER}"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start PHP-FPM
 did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${PHP_CNF_HOST}:${PHP_CNF_CONT}" )"

tests/prod/08-test-custom-user-scripts-1.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
+
+IMAGE="${1}"
+VERSION="${2}"
+FLAVOUR="${3}"
+
+# shellcheck disable=SC1090
+. "${CWD}/../.lib.sh"
+
+
+
+############################################################
+# Tests
+############################################################
+
+###
+### Check if PHP still starts up with working scripts
+###
+RUN_SH_HOST="$( mktemp -d )"
+RUN_SH_CONT="/startup.1.d"
+
+# Fix mount permissions
+chmod 0777 "${RUN_SH_HOST}"
+
+# Add a startup script to execute
+printf "#!/bin/bash\\necho 'abcdefghijklmnopq';\\n" > "${RUN_SH_HOST}/myscript1.sh"
+chmod +x "${RUN_SH_HOST}/myscript1.sh"
+
+# Start PHP-FPM
+did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"
+
+# Wait for both containers to be up and running
+run "sleep 10"
+
+# Check entrypoint for script run
+if ! run "docker logs ${did} | grep 'myscript1.sh'"; then
+	docker_logs "${did}"  || true
+	docker_stop "${did}"  || true
+	rm -rf "${RUN_SH_HOST}"
+	echo "Failed"
+	exit 1
+fi
+
+# Check entrypoint for script output
+if ! run "docker logs ${did} | grep 'abcdefghijklmnopq'"; then
+	docker_logs "${did}"  || true
+	docker_stop "${did}"  || true
+	rm -rf "${RUN_SH_HOST}"
+	echo "Failed"
+	exit 1
+fi
+
+
+# Cleanup
+docker_stop "${did}"
+rm -rf "${RUN_SH_HOST}"

tests/prod/09-test-custom-user-scripts-2.sh

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+CWD="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
+
+IMAGE="${1}"
+VERSION="${2}"
+FLAVOUR="${3}"
+
+# shellcheck disable=SC1090
+. "${CWD}/../.lib.sh"
+
+
+
+############################################################
+# Tests
+############################################################
+
+###
+### Check if PHP still starts up with working scripts
+###
+RUN_SH_HOST="$( mktemp -d )"
+RUN_SH_CONT="/startup.2.d"
+
+# Fix mount permissions
+chmod 0777 "${RUN_SH_HOST}"
+
+# Add a startup script to execute
+printf "#!/bin/bash\\necho 'abcdefghijklmnopq';\\n" > "${RUN_SH_HOST}/myscript1.sh"
+chmod +x "${RUN_SH_HOST}/myscript1.sh"
+
+# Start PHP-FPM
+did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2 -e NEW_UID=$(id -u) -e NEW_GID=$(id -g) -v ${RUN_SH_HOST}:${RUN_SH_CONT}" )"
+
+# Wait for both containers to be up and running
+run "sleep 10"
+
+# Check entrypoint for script run
+if ! run "docker logs ${did} | grep 'myscript1.sh'"; then
+	docker_logs "${did}"  || true
+	docker_stop "${did}"  || true
+	rm -rf "${RUN_SH_HOST}"
+	echo "Failed"
+	exit 1
+fi
+
+# Check entrypoint for script output
+if ! run "docker logs ${did} | grep 'abcdefghijklmnopq'"; then
+	docker_logs "${did}"  || true
+	docker_stop "${did}"  || true
+	rm -rf "${RUN_SH_HOST}"
+	echo "Failed"
+	exit 1
+fi
+
+
+# Cleanup
+docker_stop "${did}"
+rm -rf "${RUN_SH_HOST}"

tests/work/01-test-env-mysqldump-secure.sh

@@ -27,7 +27,7 @@ MOUNTPOINT="$( mktemp --directory )"
 CONTAINER="mysql:5.6"
 
 # Pull Container
-run "docker pull ${CONTAINER}"
+run "until docker pull ${CONTAINER}; do sleep 1; done"
 
 # Start mysql container
 mdid="$( docker_run "${CONTAINER}" "-e MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" )"