Merge pull request #103 from devilbox/release-0.79

Use PHP Xdebug 2.7 Release

.travis.yml

@@ -33,6 +33,7 @@ env:
     - PHP=7.2
     - PHP=7.3
     - PHP=7.4
+    - PHP=8.0
 
 
 ###
@@ -99,30 +100,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 +131,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/base/Dockerfile-8.0

@@ -0,0 +1,95 @@
+# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
+FROM devilbox/php-fpm-8.0
+MAINTAINER "cytopia" <cytopia@everythingcli.org>
+
+
+###
+### Labels
+###
+LABEL \
+	name="cytopia's PHP-FPM 8.0 Image" \
+	image="devilbox/php-fpm" \
+	tag="8.0-base" \
+	vendor="devilbox" \
+	license="MIT"
+
+
+###
+### Envs
+###
+ENV MY_USER="devilbox" \
+	MY_GROUP="devilbox" \
+	MY_UID="1000" \
+	MY_GID="1000" \
+	PHP_VERSION="8.0"
+
+
+###
+### User/Group
+###
+RUN set -x \
+	&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
+	&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
+
+
+###
+### Upgrade (install ps)
+###
+RUN set -x \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& rm -rf /var/lib/apt/lists/*
+
+
+###
+### Configure
+###
+RUN set -x \
+	&& rm -rf /usr/local/etc/php-fpm.d \
+	&& mkdir -p /usr/local/etc/php-fpm.d \
+	&& mkdir -p /var/lib/php/session \
+	&& mkdir -p /var/lib/php/wsdlcache \
+	&& chown -R devilbox:devilbox /var/lib/php/session \
+	&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
+
+
+###
+### Copy files
+###
+COPY ./data/php-ini.d/php-8.0.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-8.0.conf /usr/local/etc/php-fpm.conf
+
+COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
+COPY ./data/docker-entrypoint.d /docker-entrypoint.d
+
+
+###
+### Verify
+###
+RUN set -x \
+	&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
+	&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^8.0' \
+	&& /usr/local/sbin/php-fpm --test \
+	\
+	&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
+	&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
+	\
+	&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
+	&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
+	&& rm -f /usr/local/etc/php/php.ini
+
+
+###
+### Ports
+###
+EXPOSE 9000
+
+
+###
+### Entrypoint
+###
+ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/base/data/php-fpm.conf/php-fpm-8.0.conf

@@ -0,0 +1,134 @@
+; ################################################################################
+; ####
+; #### The following settings can be overwritten by later includes
+; ####
+; ################################################################################
+
+
+; ############################################################
+; Timeouts
+; ############################################################
+
+[www]
+; The timeout for serving a single request after which the worker process will be killed.
+; This option should be used when the 'max_execution_time' ini option does not stop script
+; execution for some reason.
+request_terminate_timeout = 120s
+
+
+; ############################################################
+; Logging
+; ############################################################
+
+[global]
+error_log = /proc/self/fd/2
+log_level = notice
+
+[www]
+; if we send this to /proc/self/fd/1, it never appears
+access.log = /proc/self/fd/2
+
+
+; ############################################################
+; Backlog configuration
+; ############################################################
+
+[www]
+; A maximum of backlog incoming connections will be queued for processing.
+; If a connection request arrives with the queue full the client may receive an error with an
+; indication of ECONNREFUSED, or, if the underlying protocol supports retransmission,
+; the request may be ignored so that retries may succeed.
+
+; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
+; are silently truncated
+listen.backlog = 1024
+
+
+; ############################################################
+; Worker configuration
+; ############################################################
+
+[www]
+; static - the number of child processes is fixed (pm.max_children).
+;
+; dynamic - the number of child processes is set dynamically based on the following directives:
+; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers.
+;
+; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where
+; pm.start_servers are started when the service is started.
+pm = ondemand
+
+; The maximum number of child processes to be created
+pm.max_children = 50
+
+; The number of child processes created on startup. Used only when pm is set to dynamic.
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2.
+pm.start_servers = 4
+
+; The desired minimum number of idle server processes.
+pm.min_spare_servers = 2
+
+; The desired maximum number of idle server processes.
+pm.max_spare_servers = 6
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries.
+; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default value: 0.
+pm.max_requests = 500
+
+; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand
+pm.process_idle_timeout = 10s
+
+
+; ############################################################
+; Include
+; ############################################################
+
+
+[global]
+include   = /usr/local/etc/php-fpm.d/*.conf
+
+
+; ################################################################################
+; ####
+; #### The following settings overwrite any includes again
+; ####
+; ################################################################################
+
+
+; ############################################################
+; Required for Dockerization
+; ############################################################
+
+[global]
+daemonize = no
+
+[www]
+; Keep env variables set by docker
+clear_env = no
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environement, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+catch_workers_output = yes
+
+
+; ############################################################
+; User and Group
+; ############################################################
+
+[www]
+user  = devilbox
+group = devilbox
+
+
+; ############################################################
+; Networking
+; ############################################################
+
+[www]
+; Ensure to listen here
+listen         = 9000

Dockerfiles/base/data/php-ini.d/php-8.0.ini

@@ -0,0 +1,49 @@
+; ############################################################
+; # Devilbox PHP defaults for 8.0-base
+; ############################################################
+
+; Each PHP flavour (base, mods, prod, work) might have its own php.ini.
+; If none is present, the one from the previous flavour is inherited.
+
+
+[PHP]
+
+; Memory
+; Note: "memory_limit" should be larger than "post_max_size"
+memory_limit            = 512M
+
+
+; Timeouts
+max_execution_time      = 120
+max_input_time          = 120
+
+
+; Uploads
+; Note: "post_max_size" should be greater than "upload_max_filesize"
+post_max_size           = 72M
+upload_max_filesize     = 64M
+max_file_uploads        = 20
+
+
+; Vars
+variables_order         = EGPCS
+max_input_vars          = 8000
+max_input_nesting_level = 64
+
+
+; Error reporting
+; Note: error_log is dynamic and handled during start to set appropriate setting
+error_reporting         = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+xmlrpc_errors           = Off
+report_memleaks         = On
+display_errors          = Off
+display_startup_errors  = Off
+log_errors              = On
+html_errors             = Off
+
+
+; Xdebug settings
+xdebug.default_enable   = Off
+xdebug.profiler_enable  = Off
+xdebug.remote_enable    = Off
+xdebug.remote_autostart = Off

Dockerfiles/mods/Dockerfile-5.2

@@ -352,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/* \
 	\
@@ -480,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$' \
@@ -499,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,8 +18,10 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
@@ -56,6 +58,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -107,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) \
@@ -173,7 +176,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
 # ---- Installing PHP Extension: igbinary ----
-	&& pecl install igbinary \
+	&& pecl install igbinary-2.0.8 \
 	&& docker-php-ext-enable igbinary \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
@@ -253,6 +256,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 ----
 	&& pecl install zendopcache \
 	&& docker-php-ext-enable opcache \
@@ -400,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/* \
 	\
@@ -509,6 +532,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$' \
@@ -539,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$' \
@@ -559,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,8 +18,10 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
@@ -56,6 +58,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -107,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) \
@@ -173,7 +176,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
 # ---- Installing PHP Extension: igbinary ----
-	&& pecl install igbinary \
+	&& pecl install igbinary-2.0.8 \
 	&& docker-php-ext-enable igbinary \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
@@ -258,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 \
@@ -405,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/* \
 	\
@@ -514,6 +537,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$' \
@@ -545,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$' \
@@ -566,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,8 +18,10 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
@@ -57,6 +59,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -108,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) \
@@ -168,7 +171,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
 # ---- Installing PHP Extension: igbinary ----
-	&& pecl install igbinary \
+	&& pecl install igbinary-2.0.8 \
 	&& docker-php-ext-enable igbinary \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
@@ -248,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) \
@@ -288,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 describe --abbrev=0 --tags) \
+	&& git checkout v3.4.2 \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
@@ -399,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/* \
 	\
@@ -508,6 +531,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$' \
@@ -539,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$' \
@@ -560,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,8 +18,10 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
@@ -59,6 +61,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -128,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) \
@@ -172,7 +186,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
 # ---- Installing PHP Extension: igbinary ----
-	&& pecl install igbinary \
+	&& pecl install igbinary-2.0.8 \
 	&& docker-php-ext-enable igbinary \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
@@ -252,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) \
@@ -292,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 describe --abbrev=0 --tags) \
+	&& git checkout v3.4.2 \
 	&& cd build && ./install \
 	&& docker-php-ext-enable phalcon \
 	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
@@ -403,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/* \
 	\
@@ -512,6 +546,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$' \
@@ -536,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$' \
@@ -562,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,8 +18,10 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
@@ -39,6 +41,7 @@ ENV BUILD_DEPS \
 	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
+	libpspell-dev \
 	librabbitmq-dev \
 	librdkafka-dev \
 	librecode-dev \
@@ -59,6 +62,8 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
+	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
@@ -127,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) \
@@ -220,6 +236,7 @@ RUN set -x \
 # ---- Installing PHP Extension: memcache ----
 	&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
 	&& cd /tmp/memcache \
+	&& git checkout origin/php7 \
 	&& phpize \
 	&& ./configure  --with-zlib-dir=/usr \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
@@ -229,7 +246,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/memcache || true) \
 	\
 # ---- Installing PHP Extension: memcached ----
-	&& pecl install memcached-3.0.4 \
+	&& 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) \
@@ -245,6 +262,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) \
@@ -255,11 +289,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 \
@@ -277,13 +306,30 @@ 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 \
+	&& pecl install pdo_sqlsrv-5.3.0 \
 	&& 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) \
@@ -296,12 +342,17 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git describe --abbrev=0 --tags) \
+	&& git checkout v3.4.2 \
 	&& 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) \
+	&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
+	\
 # ---- Installing PHP Extension: recode ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
 	&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -342,7 +393,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
 # ---- Installing PHP Extension: sqlsrv ----
-	&& pecl install sqlsrv \
+	&& pecl install sqlsrv-5.3.0 \
 	&& docker-php-ext-enable sqlsrv \
 	&& (rm -rf /usr/local/lib/php/test/sqlsrv || true) \
 	&& (rm -rf /usr/local/lib/php/doc/sqlsrv || true) \
@@ -413,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/* \
 	\
@@ -518,6 +572,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$' \
@@ -534,6 +590,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$' \
@@ -544,10 +602,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$' \
@@ -568,6 +629,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 '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^swoole$' \

Dockerfiles/mods/Dockerfile-7.1

@@ -18,8 +18,10 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
@@ -39,6 +41,7 @@ ENV BUILD_DEPS \
 	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
+	libpspell-dev \
 	librabbitmq-dev \
 	librdkafka-dev \
 	librecode-dev \
@@ -59,6 +62,8 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
+	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
@@ -127,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) \
@@ -220,6 +236,7 @@ RUN set -x \
 # ---- Installing PHP Extension: memcache ----
 	&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
 	&& cd /tmp/memcache \
+	&& git checkout origin/php7 \
 	&& phpize \
 	&& ./configure  --with-zlib-dir=/usr \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
@@ -229,7 +246,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/memcache || true) \
 	\
 # ---- Installing PHP Extension: memcached ----
-	&& pecl install memcached-3.0.4 \
+	&& 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) \
@@ -245,6 +262,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) \
@@ -272,6 +306,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,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) \
@@ -291,12 +342,17 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git describe --abbrev=0 --tags) \
+	&& git checkout v3.4.2 \
 	&& 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) \
+	&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
+	\
 # ---- Installing PHP Extension: recode ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
 	&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -408,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/* \
 	\
@@ -513,6 +572,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$' \
@@ -529,6 +590,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$' \
@@ -543,8 +606,9 @@ RUN set -x \
 	&& 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$' \
@@ -565,6 +629,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 '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^swoole$' \

Dockerfiles/mods/Dockerfile-7.2

@@ -18,8 +18,10 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
@@ -39,6 +41,7 @@ ENV BUILD_DEPS \
 	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
+	libpspell-dev \
 	librabbitmq-dev \
 	librdkafka-dev \
 	librecode-dev \
@@ -59,6 +62,8 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
+	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
@@ -127,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) \
@@ -221,6 +237,7 @@ RUN set -x \
 # ---- Installing PHP Extension: memcache ----
 	&& git clone https://github.com/websupport-sk/pecl-memcache /tmp/memcache \
 	&& cd /tmp/memcache \
+	&& git checkout origin/php7 \
 	&& phpize \
 	&& ./configure  --with-zlib-dir=/usr \
 	&& make -j$(getconf _NPROCESSORS_ONLN) \
@@ -230,7 +247,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/memcache || true) \
 	\
 # ---- Installing PHP Extension: memcached ----
-	&& pecl install memcached-3.0.4 \
+	&& 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) \
@@ -246,6 +263,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) \
@@ -273,6 +307,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) \
@@ -292,12 +343,17 @@ RUN set -x \
 # ---- Installing PHP Extension: phalcon ----
 	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
 	&& cd /tmp/phalcon \
-	&& git checkout $(git describe --abbrev=0 --tags) \
+	&& 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) \
+	&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
+	\
 # ---- Installing PHP Extension: recode ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
 	&& (rm -rf /usr/local/lib/php/test/recode || true) \
@@ -409,6 +465,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/* \
 	\
@@ -514,6 +573,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$' \
@@ -530,6 +591,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$' \
@@ -544,8 +607,9 @@ RUN set -x \
 	&& 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$' \
@@ -568,6 +632,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 '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^swoole$' \

Dockerfiles/mods/Dockerfile-7.3

@@ -18,9 +18,11 @@ LABEL \
 ### Envs
 ###
 ENV BUILD_DEPS \
+	alien \
 	cmake \
 	firebird-dev \
 	freetds-dev \
+	libaio-dev \
 	libbz2-dev \
 	libc-client-dev \
 	libcurl4-openssl-dev \
@@ -36,6 +38,7 @@ ENV BUILD_DEPS \
 	libkrb5-dev \
 	libldap2-dev \
 	libmagickwand-dev \
+	libmcrypt-dev \
 	libmemcached-dev \
 	libnghttp2-dev \
 	libpng-dev \
@@ -60,6 +63,7 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
@@ -69,6 +73,7 @@ ENV RUN_DEPS \
 	libicu57 \
 	libjpeg62-turbo \
 	libmagickwand-6.q16-3 \
+	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
 	libpng16-16 \
@@ -108,6 +113,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) \
@@ -187,11 +203,20 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/ldap || true) \
 	&& (rm -rf /usr/local/lib/php/doc/ldap || true) \
 	\
+# ---- Installing PHP Extension: mcrypt ----
+	&& pecl install mcrypt-1.0.2 \
+	&& docker-php-ext-enable mcrypt \
+	&& (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: 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) \
@@ -207,6 +232,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) \
@@ -234,13 +276,30 @@ 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 \
+	&& 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) \
@@ -250,6 +309,15 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pgsql || true) \
 	\
+# ---- Installing PHP Extension: phalcon ----
+	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
+	&& cd /tmp/phalcon \
+	&& git checkout $(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) \
@@ -295,7 +363,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
 # ---- Installing PHP Extension: sqlsrv ----
-	&& pecl install sqlsrv-5.5.0preview \
+	&& 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) \
@@ -357,7 +425,7 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/wddx || true) \
 	\
 # ---- Installing PHP Extension: xdebug ----
-	&& pecl install xdebug-2.7.0beta1 \
+	&& pecl install xdebug \
 	&& docker-php-ext-enable xdebug \
 	&& (rm -rf /usr/local/lib/php/test/xdebug || true) \
 	&& (rm -rf /usr/local/lib/php/doc/xdebug || true) \
@@ -379,6 +447,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/* \
 	\
@@ -468,6 +539,10 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^libxml$' \
 	&& php -m | grep -oiE '^mbstring$' \
 	&& 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 '^memcached$' \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongodb$' \
@@ -476,6 +551,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$' \
@@ -492,6 +569,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$' \
@@ -500,6 +579,8 @@ RUN set -x \
 	&& 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$' \
@@ -507,7 +588,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$' \
@@ -530,6 +610,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 '^sqlsrv$' \
 	&& php-fpm -m | grep -oiE '^sqlsrv$' \
 	&& php -m | grep -oiE '^swoole$' \

Dockerfiles/mods/Dockerfile-7.4

@@ -18,22 +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 \
@@ -58,10 +58,11 @@ ENV BUILD_DEPS \
 	git
 
 ENV RUN_DEPS \
+	libaio1 \
 	libaspell15 \
-	libc-client2007e \
 	libenchant1c2a \
 	libfbclient2 \
+	libffi6 \
 	libfreetype6 \
 	libhiredis0.13 \
 	libicu57 \
@@ -123,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 \
@@ -147,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) \
@@ -191,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) \
@@ -218,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) \
@@ -354,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/* \
 	\
@@ -407,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$' \
@@ -425,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$' \
@@ -447,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$' \
@@ -463,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$' \
@@ -476,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$' \
@@ -499,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/mods/Dockerfile-8.0

@@ -0,0 +1,559 @@
+# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-mods.j2 instead.
+FROM devilbox/php-fpm:8.0-base
+MAINTAINER "cytopia" <cytopia@everythingcli.org>
+
+
+###
+### Labels
+###
+LABEL \
+	name="cytopia's PHP-FPM 8.0 Image" \
+	image="devilbox/php-fpm" \
+	tag="8.0-mods" \
+	vendor="devilbox" \
+	license="MIT"
+
+
+###
+### Envs
+###
+ENV BUILD_DEPS \
+	alien \
+	firebird-dev \
+	freetds-dev \
+	libaio-dev \
+	libbz2-dev \
+	libenchant-dev \
+	libevent-dev \
+	libfbclient2 \
+	libffi-dev \
+	libfreetype6-dev \
+	libgmp-dev \
+	libib-util \
+	libicu-dev \
+	libjpeg-dev \
+	libldap2-dev \
+	libmemcached-dev \
+	libpng-dev \
+	libpq-dev \
+	libpspell-dev \
+	librecode-dev \
+	libsasl2-dev \
+	libsnmp-dev \
+	libsodium-dev \
+	libssl-dev \
+	libtidy-dev \
+	libvpx-dev \
+	libwebp-dev \
+	libxml2-dev \
+	libxpm-dev \
+	libxslt-dev \
+	libzip-dev \
+	snmp \
+	zlib1g-dev \
+	ca-certificates \
+	git
+
+ENV RUN_DEPS \
+	libaio1 \
+	libaspell15 \
+	libenchant1c2a \
+	libfbclient2 \
+	libffi6 \
+	libfreetype6 \
+	libicu57 \
+	libjpeg62-turbo \
+	libmemcachedutil2 \
+	libpng16-16 \
+	libpq5 \
+	librecode0 \
+	libsybdb5 \
+	libtidy5 \
+	libvpx4 \
+	libwebp6 \
+	libxpm4 \
+	libxslt1.1 \
+	libzip4 \
+	snmp \
+	ca-certificates
+
+
+###
+### Install
+###
+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 \
+		${BUILD_DEPS} \
+	\
+	\
+# ---- Installing PHP Extension: bcmath ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \
+	&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
+	&& (rm -rf /usr/local/lib/php/doc/bcmath || 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) \
+	&& (rm -rf /usr/local/lib/php/doc/bz2 || true) \
+	\
+# ---- Installing PHP Extension: calendar ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \
+	&& (rm -rf /usr/local/lib/php/test/calendar || true) \
+	&& (rm -rf /usr/local/lib/php/doc/calendar || true) \
+	\
+# ---- Installing PHP Extension: dba ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \
+	&& (rm -rf /usr/local/lib/php/test/dba || true) \
+	&& (rm -rf /usr/local/lib/php/doc/dba || true) \
+	\
+# ---- Installing PHP Extension: enchant ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \
+	&& (rm -rf /usr/local/lib/php/test/enchant || true) \
+	&& (rm -rf /usr/local/lib/php/doc/enchant || true) \
+	\
+# ---- Installing PHP Extension: exif ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \
+	&& (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 \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \
+	&& (rm -rf /usr/local/lib/php/test/gd || true) \
+	&& (rm -rf /usr/local/lib/php/doc/gd || true) \
+	\
+# ---- Installing PHP Extension: gettext ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \
+	&& (rm -rf /usr/local/lib/php/test/gettext || true) \
+	&& (rm -rf /usr/local/lib/php/doc/gettext || true) \
+	\
+# ---- Installing PHP Extension: gmp ----
+	&& ln /usr/include/x86_64-linux-gnu/gmp.h /usr/include/ \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \
+	&& (rm -rf /usr/local/lib/php/test/gmp || true) \
+	&& (rm -rf /usr/local/lib/php/doc/gmp || 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) \
+	&& (rm -rf /usr/local/lib/php/doc/interbase || true) \
+	\
+# ---- Installing PHP Extension: intl ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \
+	&& (rm -rf /usr/local/lib/php/test/intl || true) \
+	&& (rm -rf /usr/local/lib/php/doc/intl || true) \
+	\
+# ---- Installing PHP Extension: ldap ----
+	&& ln -s /usr/lib/x86_64-linux-gnu/libldap* /usr/lib/ \
+	&& /usr/local/bin/docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \
+	&& (rm -rf /usr/local/lib/php/test/ldap || true) \
+	&& (rm -rf /usr/local/lib/php/doc/ldap || 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 \
+	&& docker-php-ext-enable memcached \
+	&& (rm -rf /usr/local/lib/php/test/memcached || true) \
+	&& (rm -rf /usr/local/lib/php/doc/memcached || true) \
+	\
+# ---- Installing PHP Extension: mongodb ----
+	&& git clone https://github.com/mongodb/mongo-php-driver /tmp/mongodb \
+	&& cd /tmp/mongodb \
+	&& git submodule update --init \
+&& phpize \
+&& ./configure --enable-mongodb \
+&& make all \
+&& make install \
+ \
+	&& docker-php-ext-enable mongodb \
+	&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
+	&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
+	\
+# ---- Installing PHP Extension: 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) \
+	&& (rm -rf /usr/local/lib/php/doc/opcache || true) \
+	\
+# ---- Installing PHP Extension: pcntl ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \
+	&& (rm -rf /usr/local/lib/php/test/pcntl || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pcntl || 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 \
+	&& (rm -rf /usr/local/lib/php/test/pdo_dblib || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_dblib || true) \
+	\
+# ---- Installing PHP Extension: pdo_firebird ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \
+	&& (rm -rf /usr/local/lib/php/test/pdo_firebird || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pdo_firebird || true) \
+	\
+# ---- Installing PHP Extension: pdo_mysql ----
+	&& /usr/local/bin/docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
+	&& (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: 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: pspell ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
+	&& (rm -rf /usr/local/lib/php/test/pspell || true) \
+	&& (rm -rf /usr/local/lib/php/doc/pspell || true) \
+	\
+# ---- Installing PHP Extension: recode ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
+	&& (rm -rf /usr/local/lib/php/test/recode || true) \
+	&& (rm -rf /usr/local/lib/php/doc/recode || true) \
+	\
+# ---- Installing PHP Extension: redis ----
+	&& git clone https://github.com/phpredis/phpredis /tmp/redis \
+	&& cd /tmp/redis \
+	&& phpize \
+&& sed -i'' 's/ZEND_ACC_CTOR | //g' redis.c \
+&& sed -i'' 's/ZEND_ACC_DTOR | //g' redis.c \
+&& sed -i'' 's/ZEND_ACC_CTOR | //g' redis_cluster.c \
+&& ./configure \
+&& make -j$(getconf _NPROCESSORS_ONLN) \
+&& make install \
+ \
+	&& docker-php-ext-enable redis \
+	&& (rm -rf /usr/local/lib/php/test/redis || true) \
+	&& (rm -rf /usr/local/lib/php/doc/redis || true) \
+	\
+# ---- Installing PHP Extension: shmop ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
+	&& (rm -rf /usr/local/lib/php/test/shmop || true) \
+	&& (rm -rf /usr/local/lib/php/doc/shmop || true) \
+	\
+# ---- Installing PHP Extension: snmp ----
+	&& /usr/local/bin/docker-php-ext-configure snmp --with-openssl-dir \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \
+	&& (rm -rf /usr/local/lib/php/test/snmp || true) \
+	&& (rm -rf /usr/local/lib/php/doc/snmp || true) \
+	\
+# ---- Installing PHP Extension: soap ----
+	&& /usr/local/bin/docker-php-ext-configure soap --with-libxml-dir=/usr \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
+	&& (rm -rf /usr/local/lib/php/test/soap || true) \
+	&& (rm -rf /usr/local/lib/php/doc/soap || true) \
+	\
+# ---- Installing PHP Extension: sockets ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \
+	&& (rm -rf /usr/local/lib/php/test/sockets || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
+	\
+# ---- Installing PHP Extension: sodium ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sodium \
+	&& (rm -rf /usr/local/lib/php/test/sodium || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sodium || true) \
+	\
+# ---- Installing PHP Extension: sysvmsg ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \
+	&& (rm -rf /usr/local/lib/php/test/sysvmsg || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sysvmsg || true) \
+	\
+# ---- Installing PHP Extension: sysvsem ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \
+	&& (rm -rf /usr/local/lib/php/test/sysvsem || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sysvsem || true) \
+	\
+# ---- Installing PHP Extension: sysvshm ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \
+	&& (rm -rf /usr/local/lib/php/test/sysvshm || true) \
+	&& (rm -rf /usr/local/lib/php/doc/sysvshm || true) \
+	\
+# ---- Installing PHP Extension: tidy ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \
+	&& (rm -rf /usr/local/lib/php/test/tidy || true) \
+	&& (rm -rf /usr/local/lib/php/doc/tidy || true) \
+	\
+# ---- Installing PHP Extension: uploadprogress ----
+	&& git clone https://github.com/php/pecl-php-uploadprogress /tmp/uploadprogress \
+	&& cd /tmp/uploadprogress \
+	&& phpize \
+	&& ./configure  --enable-uploadprogress \
+	&& make -j$(getconf _NPROCESSORS_ONLN) \
+	&& make install \
+	&& docker-php-ext-enable uploadprogress \
+	&& (rm -rf /usr/local/lib/php/test/uploadprogress || true) \
+	&& (rm -rf /usr/local/lib/php/doc/uploadprogress || true) \
+	\
+# ---- Installing PHP Extension: wddx ----
+	&& /usr/local/bin/docker-php-ext-configure wddx --with-libxml-dir=/usr \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \
+	&& (rm -rf /usr/local/lib/php/test/wddx || true) \
+	&& (rm -rf /usr/local/lib/php/doc/wddx || true) \
+	\
+# ---- Installing PHP Extension: xmlrpc ----
+	&& /usr/local/bin/docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \
+	&& (rm -rf /usr/local/lib/php/test/xmlrpc || true) \
+	&& (rm -rf /usr/local/lib/php/doc/xmlrpc || true) \
+	\
+# ---- Installing PHP Extension: xsl ----
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \
+	&& (rm -rf /usr/local/lib/php/test/xsl || true) \
+	&& (rm -rf /usr/local/lib/php/doc/xsl || true) \
+	\
+# ---- Installing PHP Extension: zip ----
+	&& /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \
+	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \
+	&& (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/* \
+	\
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false ${BUILD_DEPS} \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests ${RUN_DEPS} \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+	&& update-ca-certificates \
+	\
+	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
+	&& (find "$(php -r 'echo ini_get("extension_dir");')" -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+
+
+###
+### Verify
+###
+RUN set -x \
+	&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
+	&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^8.0' \
+	&& /usr/local/sbin/php-fpm --test \
+	\
+	&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
+	&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
+	\
+	&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
+	&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
+	&& rm -f /usr/local/etc/php/php.ini \
+	\
+	&& php -m | grep -oiE '^bcmath$' \
+	&& php-fpm -m | grep -oiE '^bcmath$' \
+	&& php -m | grep -oiE '^bz2$' \
+	&& php-fpm -m | grep -oiE '^bz2$' \
+	&& php -m | grep -oiE '^calendar$' \
+	&& php-fpm -m | grep -oiE '^calendar$' \
+	&& php -m | grep -oiE '^ctype$' \
+	&& php-fpm -m | grep -oiE '^ctype$' \
+	&& php -m | grep -oiE '^curl$' \
+	&& php-fpm -m | grep -oiE '^curl$' \
+	&& php -m | grep -oiE '^dba$' \
+	&& php-fpm -m | grep -oiE '^dba$' \
+	&& php -m | grep -oiE '^dom$' \
+	&& php-fpm -m | grep -oiE '^dom$' \
+	&& php -m | grep -oiE '^enchant$' \
+	&& 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$' \
+	&& php-fpm -m | grep -oiE '^filter$' \
+	&& php -m | grep -oiE '^ftp$' \
+	&& php-fpm -m | grep -oiE '^ftp$' \
+	&& php -m | grep -oiE '^gd$' \
+	&& php-fpm -m | grep -oiE '^gd$' \
+	&& php -m | grep -oiE '^gettext$' \
+	&& php-fpm -m | grep -oiE '^gettext$' \
+	&& php -m | grep -oiE '^gmp$' \
+	&& php-fpm -m | grep -oiE '^gmp$' \
+	&& php -m | grep -oiE '^hash$' \
+	&& php-fpm -m | grep -oiE '^hash$' \
+	&& php -m | grep -oiE '^iconv$' \
+	&& php-fpm -m | grep -oiE '^iconv$' \
+	&& php -m | grep -oiE '^interbase$' \
+	&& php-fpm -m | grep -oiE '^interbase$' \
+	&& php -m | grep -oiE '^intl$' \
+	&& php-fpm -m | grep -oiE '^intl$' \
+	&& php -m | grep -oiE '^json$' \
+	&& php-fpm -m | grep -oiE '^json$' \
+	&& php -m | grep -oiE '^ldap$' \
+	&& php-fpm -m | grep -oiE '^ldap$' \
+	&& php -m | grep -oiE '^libxml$' \
+	&& php-fpm -m | grep -oiE '^libxml$' \
+	&& php -m | grep -oiE '^mbstring$' \
+	&& php-fpm -m | grep -oiE '^mbstring$' \
+	&& 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 '^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$' \
+	&& php-fpm -m | grep -oiE '^openssl$' \
+	&& php -m | grep -oiE '^pcntl$' \
+	&& php-fpm -m | grep -oiE '^pcntl$' \
+	&& php -m | grep -oiE '^pcre$' \
+	&& php-fpm -m | grep -oiE '^pcre$' \
+	&& php -m | grep -oiE '^pdo$' \
+	&& php-fpm -m | grep -oiE '^pdo$' \
+	&& php -m | grep -oiE '^pdo_dblib$' \
+	&& php-fpm -m | grep -oiE '^pdo_dblib$' \
+	&& php -m | grep -oiE '^pdo_firebird$' \
+	&& 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 '^pgsql$' \
+	&& php-fpm -m | grep -oiE '^pgsql$' \
+	&& 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 -m | grep -oiE '^recode$' \
+	&& php-fpm -m | grep -oiE '^recode$' \
+	&& php -m | grep -oiE '^redis$' \
+	&& php-fpm -m | grep -oiE '^redis$' \
+	&& php -m | grep -oiE '^reflection$' \
+	&& php-fpm -m | grep -oiE '^reflection$' \
+	&& php -m | grep -oiE '^session$' \
+	&& php-fpm -m | grep -oiE '^session$' \
+	&& php -m | grep -oiE '^shmop$' \
+	&& php-fpm -m | grep -oiE '^shmop$' \
+	&& php -m | grep -oiE '^simplexml$' \
+	&& php-fpm -m | grep -oiE '^simplexml$' \
+	&& php -m | grep -oiE '^snmp$' \
+	&& php-fpm -m | grep -oiE '^snmp$' \
+	&& php -m | grep -oiE '^soap$' \
+	&& php-fpm -m | grep -oiE '^soap$' \
+	&& php -m | grep -oiE '^sockets$' \
+	&& 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 '^sysvmsg$' \
+	&& php-fpm -m | grep -oiE '^sysvmsg$' \
+	&& php -m | grep -oiE '^sysvsem$' \
+	&& php-fpm -m | grep -oiE '^sysvsem$' \
+	&& php -m | grep -oiE '^sysvshm$' \
+	&& php-fpm -m | grep -oiE '^sysvshm$' \
+	&& php -m | grep -oiE '^tidy$' \
+	&& php-fpm -m | grep -oiE '^tidy$' \
+	&& php -m | grep -oiE '^tokenizer$' \
+	&& php-fpm -m | grep -oiE '^tokenizer$' \
+	&& php -m | grep -oiE '^uploadprogress$' \
+	&& php-fpm -m | grep -oiE '^uploadprogress$' \
+	&& php -m | grep -oiE '^wddx$' \
+	&& php-fpm -m | grep -oiE '^wddx$' \
+	&& php -m | grep -oiE '^xml$' \
+	&& php-fpm -m | grep -oiE '^xml$' \
+	&& php -m | grep -oiE '^xmlreader$' \
+	&& php-fpm -m | grep -oiE '^xmlreader$' \
+	&& php -m | grep -oiE '^xmlrpc$' \
+	&& php-fpm -m | grep -oiE '^xmlrpc$' \
+	&& php -m | grep -oiE '^xmlwriter$' \
+	&& php-fpm -m | grep -oiE '^xmlwriter$' \
+	&& php -m | grep -oiE '^xsl$' \
+	&& php-fpm -m | grep -oiE '^xsl$' \
+	&& php -m | grep -oiE '^zip$' \
+	&& php-fpm -m | grep -oiE '^zip$' \
+	&& true
+
+
+###
+### Ports
+###
+EXPOSE 9000
+
+
+###
+### Entrypoint
+###
+ENTRYPOINT ["/docker-entrypoint.sh"]

Dockerfiles/prod/Dockerfile-8.0

@@ -0,0 +1,90 @@
+# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-prod.j2 instead.
+FROM devilbox/php-fpm:8.0-mods
+MAINTAINER "cytopia" <cytopia@everythingcli.org>
+
+
+###
+### Labels
+###
+LABEL \
+	name="cytopia's PHP-FPM 8.0 Image" \
+	image="devilbox/php-fpm" \
+	tag="8.0-prod" \
+	vendor="devilbox" \
+	license="MIT"
+
+
+###
+### Install
+###
+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 \
+		locales-all \
+		postfix \
+		postfix-pcre \
+		cron \
+		rsyslog \
+		socat \
+		supervisor \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+	&& rm -rf /etc/supervisor* \
+	&& mkdir -p /etc/supervisor/conf.d \
+	&& mkdir -p /var/log/supervisor \
+	\
+	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+
+
+
+###
+### Verify
+###
+RUN set -x \
+	&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
+	&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^8.0' \
+	&& /usr/local/sbin/php-fpm --test \
+	\
+	&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
+	&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
+	\
+	&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
+	&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
+	&& rm -f /usr/local/etc/php/php.ini
+
+
+###
+### Copy files
+###
+COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
+COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
+COPY ./data/postfix.sh /usr/local/sbin/postfix.sh
+COPY ./data/supervisord.conf /etc/supervisor/supervisord.conf
+
+
+###
+### Volumes
+###
+VOLUME /var/log/php
+VOLUME /var/mail
+
+
+
+###
+### Ports
+###
+EXPOSE 9000
+
+
+###
+### Entrypoint
+###
+ENTRYPOINT ["/docker-entrypoint.sh"]

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
 
 
@@ -181,7 +181,8 @@ disable_modules "DISABLE_MODULES" "${DEBUG_LEVEL}"
 ###
 ### Run custom user supplied scripts
 ###
-execute_custom_scripts "/startup.d" "${DEBUG_LEVEL}"
+execute_custom_scripts "/startup.1.d" "${DEBUG_LEVEL}"
+execute_custom_scripts "/startup.2.d" "${DEBUG_LEVEL}"
 
 
 ###

Dockerfiles/work/Dockerfile-5.2

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +201,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
@@ -212,6 +217,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # yamllint
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \
@@ -306,8 +323,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]+' \
+	&& pm2 --no-daemon --version | grep -E '[.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true
 

Dockerfiles/work/Dockerfile-5.3

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +231,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
@@ -246,6 +255,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://github.com/wp-cli/wp-cli/releases/download/v1.5.1/wp-cli-1.5.1.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -347,9 +368,12 @@ 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]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-5.4

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +154,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 +257,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
@@ -275,6 +284,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -367,7 +388,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,10 +400,13 @@ 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]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-5.5

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +158,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 +264,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 +283,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
@@ -286,6 +295,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -379,7 +400,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,11 +413,14 @@ 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]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-5.6

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +158,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 +277,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 +296,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
@@ -299,6 +308,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -392,7 +413,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,11 +427,14 @@ 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]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.0

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +158,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 +277,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 +296,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
@@ -299,6 +308,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -392,7 +413,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,11 +427,14 @@ 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]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.1

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +158,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 +277,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 +296,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
@@ -299,6 +308,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -392,7 +413,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,11 +427,14 @@ 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]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.2

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +158,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 +277,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 +296,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
@@ -299,6 +308,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -392,7 +413,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,11 +427,14 @@ 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]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.3

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +158,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 +266,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 +285,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
@@ -288,6 +297,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -381,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*$' \
@@ -394,11 +415,14 @@ 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]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-7.4

@@ -31,6 +31,8 @@ RUN set -x \
 		dirmngr \
 		gnupg \
 	&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& 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_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -103,9 +106,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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 +158,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 +266,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 +281,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
@@ -288,6 +293,18 @@ RUN set -x \
 && yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
 && rm -rf /tmp/y \
  \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
 # wpcli
 	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
 	&& chmod +x /usr/local/bin/wp \
@@ -381,7 +398,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,9 +413,11 @@ 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]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
 	&& wp --allow-root --version | grep -E '[.0-9]+' \
 	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
 	&& true

Dockerfiles/work/Dockerfile-8.0

@@ -0,0 +1,389 @@
+# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-work.j2 instead.
+FROM devilbox/php-fpm:8.0-prod
+MAINTAINER "cytopia" <cytopia@everythingcli.org>
+
+
+###
+### Labels
+###
+LABEL \
+	name="cytopia's PHP-FPM 8.0 Image" \
+	image="devilbox/php-fpm" \
+	tag="8.0-work" \
+	vendor="devilbox" \
+	license="MIT"
+
+
+###
+### Envs
+###
+ENV BASH_PROFILE=".bashrc"
+
+
+###
+### Install Tools
+###
+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 \
+	&& 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_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 -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 -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 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 \
+		ack-grep \
+		aspell \
+		autoconf \
+		automake \
+		bash-completion \
+		binutils \
+		blackfire-agent \
+		build-essential \
+		bzip2 \
+		coreutils \
+		dnsutils \
+		dos2unix \
+		file \
+		gawk \
+		gcc \
+		git \
+		git-flow \
+		git-svn \
+		graphviz \
+		hostname \
+		htop \
+		imagemagick \
+		iputils-ping \
+		jq \
+		less \
+		libc-dev \
+		libffi-dev\
+		libssl-dev\
+		libyaml-dev \
+		make \
+		mongodb-org-shell \
+		mongodb-org-tools \
+		moreutils \
+		mysql-client \
+		nano \
+		net-tools \
+		netcat \
+		nodejs \
+		openssh-client \
+		patch \
+		patchelf \
+		postgresql-client \
+		python-cffi \
+		python-dev \
+		python-pip \
+		python-wheel \
+		redis-tools \
+		rsync \
+		rubygems \
+		ruby-dev \
+		shellcheck \
+		silversearcher-ag \
+		subversion \
+		sudo \
+		tig \
+		tree \
+		unzip \
+		vim \
+		w3m \
+		wget \
+		whois \
+		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/* \
+	\
+# Get newer pip version
+	&& pip install --upgrade pip \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false python-pip \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+
+
+RUN set -x \
+# composer
+	&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+# ansible
+	&& /usr/local/bin/pip install --no-cache-dir --upgrade setuptools  \
+&& /usr/local/bin/pip install --no-cache-dir ansible \
+ \
+# awesomeci
+	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
+&& cd /usr/local/src/awesome-ci \
+&& git checkout $(git describe --abbrev=0 --tags) \
+&& ./configure --prefix=/usr/local \
+&& make install \
+&& cd / \
+&& rm -rf /usr/local/src/awesome-ci \
+ \
+	&& gem install mixlib-config -v 2.2.4 \
+&& gem install rb-inotify -v 0.9.10 \
+&& gem install mdl \
+&& gem install scss_lint \
+&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y eslint \
+&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y jsonlint \
+&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y mdlint \
+&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y gulp \
+&& rm -rf /tmp/y \
+ \
+# deployer
+	&& curl -sS https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& chmod +x /usr/local/bin/dep \
+# drupalconsole
+	&& curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
+	&& chmod +x /usr/local/bin/drupal \
+# gitflow
+	&& git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \
+&& cd /tmp/gitflow \
+&& make install \
+&& cd / && rm -rf /tmp/gitflow \
+ \
+# grunt
+	&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt; do sleep 1; done \
+&& until yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y grunt-cli; do sleep 1; done \
+&& rm -rf /tmp/y \
+ \
+# linkcheck
+	&& curl https://raw.githubusercontent.com/cytopia/linkcheck/master/linkcheck > /usr/local/bin/linkcheck \
+&& chmod +x /usr/local/bin/linkcheck \
+ \
+# linuxbrew
+	&& git clone https://github.com/Linuxbrew/brew.git /usr/local/src/linuxbrew \
+&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/linuxbrew \
+&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
+    'echo "PATH=/usr/local/src/linuxbrew/bin:/usr/local/src/linuxbrew/sbin:/usr/bin:/usr/sbin:/bin:/sbin" >> /home/devilbox/${v}' \
+&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
+    'echo "export MANPATH=/usr/local/src/linuxbrew/share/man:${MANPATH}"   >> /home/devilbox/${v}' \
+&& v="${BASH_PROFILE}" su ${MY_USER} -c -p \
+    'echo "export INFOPATH=/usr/local/src/linuxbrew/share/man:${INFOPATH}" >> /home/devilbox/${v}' \
+&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew config' \
+ \
+# mhsendmail
+	&& wget https://github.com/mailhog/mhsendmail/releases/download/v0.2.0/mhsendmail_linux_amd64 \
+&& chmod +x mhsendmail_linux_amd64 \
+&& mv mhsendmail_linux_amd64 /usr/local/bin/mhsendmail \
+ \
+# mysqldumpsecure
+	&& git clone https://github.com/cytopia/mysqldump-secure.git /usr/local/src/mysqldump-secure \
+&& cd /usr/local/src/mysqldump-secure \
+&& git checkout $(git describe --abbrev=0 --tags) \
+&& cp /usr/local/src/mysqldump-secure/bin/mysqldump-secure /usr/local/bin \
+&& cp /usr/local/src/mysqldump-secure/etc/mysqldump-secure.conf /etc \
+&& cp /usr/local/src/mysqldump-secure/etc/mysqldump-secure.cnf /etc \
+&& touch /var/log/mysqldump-secure.log \
+&& chown ${MY_USER}:${MY_GROUP} /etc/mysqldump-secure.* \
+&& chown ${MY_USER}:${MY_GROUP} /var/log/mysqldump-secure.log \
+&& chmod 0400 /etc/mysqldump-secure.conf \
+&& chmod 0400 /etc/mysqldump-secure.cnf \
+&& chmod 0644 /var/log/mysqldump-secure.log \
+&& sed -i'' 's/^COMPRESS_ARG=.*/COMPRESS_ARG="-9 -c"/g' /etc/mysqldump-secure.conf \
+&& sed -i'' 's/^DUMP_DIR=.*/DUMP_DIR="\/shared\/backups\/mysql"/g' /etc/mysqldump-secure.conf \
+&& sed -i'' 's/^DUMP_DIR_CHMOD=.*/DUMP_DIR_CHMOD="0755"/g' /etc/mysqldump-secure.conf \
+&& sed -i'' 's/^DUMP_FILE_CHMOD=.*/DUMP_FILE_CHMOD="0644"/g' /etc/mysqldump-secure.conf \
+&& sed -i'' 's/^LOG_CHMOD=.*/LOG_CHMOD="0644"/g' /etc/mysqldump-secure.conf \
+&& sed -i'' 's/^NAGIOS_LOG=.*/NAGIOS_LOG=0/g' /etc/mysqldump-secure.conf \
+&& cd / \
+&& rm -rf /usr/local/src/mysqldump-secure \
+ \
+# phpcs
+	&& 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 -sS -L https://squizlabs.github.io/PHP_CodeSniffer/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 \
+# symfony
+	&& curl https://symfony.com/installer -L -o /usr/local/bin/symfony \
+	&& chmod +x /usr/local/bin/symfony \
+# webpack
+	&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack \
+&& yarn global add --prod  --non-interactive --link-duplicates --silent --cache-folder /tmp/y webpack-cli \
+&& rm -rf /tmp/y \
+ \
+# wkhtmltopdf
+	&& VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+&& curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+&& dpkg -i /tmp/wkhtmltopdf.deb \
+&& rm -f /tmp/wkhtmltopdf.deb \
+ \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+&& rm -rf /var/lib/apt/lists/* \
+ \
+# wpcli
+	&& curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -L -o /usr/local/bin/wp \
+	&& chmod +x /usr/local/bin/wp \
+# yamllint
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests libpython-dev python-setuptools libyaml-dev \
+ \
+	&& /usr/local/bin/pip install --no-cache-dir yamllint \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false libpython-dev python-setuptools libyaml-dev \
+&& rm -rf /var/lib/apt/lists/* \
+ \
+# cleanup
+	&& rm -rf /home/${MY_USER}/.*json \
+&& rm -rf /home/${MY_USER}/.cache \
+&& rm -rf /home/${MY_USER}/.composer \
+&& rm -rf /home/${MY_USER}/.config \
+&& rm -rf /home/${MY_USER}/.drush \
+&& rm -rf /home/${MY_USER}/.gem \
+&& rm -rf /home/${MY_USER}/.npm \
+&& rm -rf /home/${MY_USER}/.subversion \
+&& rm -rf /home/${MY_USER}/.v8* \
+\
+&& rm -rf /root/.*json \
+&& rm -rf /root/.cache \
+&& rm -rf /root/.composer \
+&& rm -rf /root/.config \
+&& rm -rf /root/.drush \
+&& rm -rf /root/.gem \
+&& rm -rf /root/.npm \
+&& rm -rf /root/.subversion \
+&& rm -rf /root/.v8* \
+\
+&& rm -rf /tmp/* \
+ \
+	\
+	&& (rm -rf /usr/local/src/composer/cache/* || true) \
+	\
+	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/lib -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true)
+
+
+###
+### Configure Bash
+###
+RUN \
+	{ \
+		echo "PATH=\${PATH}:/usr/local/bin:/usr/local/sbin:/usr/local/node/bin"; \
+		echo "export PATH"; \
+		echo ". /etc/bash-devilbox"; \
+		echo "if [ -d /etc/bashrc-devilbox.d/ ]; then"; \
+		echo "    for f in /etc/bashrc-devilbox.d/*.sh ; do"; \
+		echo "        if [ -r \"\${f}\" ]; then"; \
+		echo "            . \"\${f}\""; \
+		echo "        fi"; \
+		echo "    done"; \
+		echo "    unset f"; \
+		echo "fi"; \
+	} | tee -a /home/${MY_USER}/${BASH_PROFILE} /root/${BASH_PROFILE} \
+	&& chown ${MY_USER}:${MY_GROUP} /home/${MY_USER}/${BASH_PROFILE}
+
+
+###
+### Verify
+###
+RUN set -x \
+	&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
+	&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^8.0' \
+	&& /usr/local/sbin/php-fpm --test \
+	\
+	&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
+	&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
+	\
+	&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
+	&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
+	&& rm -f /usr/local/etc/php/php.ini
+
+RUN set -x \
+	&& composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \
+	&& ansible --version | grep -E '^ansible [.0-9]+$' \
+	&& mdl --version | grep -E '[.0-9]+' \
+&& scss-lint --version | grep -E '[.0-9]+' \
+&& eslint -v | grep -E '[.0-9]+' \
+&& jsonlint --version | grep -E '[.0-9]+' \
+&& mdlint --version | grep -E '[.0-9]+' \
+&& gulp --version | grep -E '[.0-9]+' \
+ \
+	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[.0-9]+' \
+	&& drupal --version | grep -E 'Drupal Console Launcher\s*[.0-9]' \
+	&& git-flow version | grep -E '[.0-9]+' \
+	&& grunt --version | grep -E '[.0-9]+' \
+	&& linkcheck --version | grep -E '^linkcheck\sv[.0-9]+' \
+	&& su - ${MY_USER} -c '/usr/local/src/linuxbrew/bin/brew --version' | grep -E 'Homebrew\s*[.0-9]+' \
+	&& 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]+' \
+	&& symfony --version | grep -E 'version\s*[.0-9]+' \
+	&& webpack --version | grep -E '[.0-9]+' \
+	&& wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)" \
+	&& wp --allow-root --version | grep -E '[.0-9]+' \
+	&& yamllint --version 2>&1 | grep -E '[.0-9]+' \
+	&& true
+
+
+###
+### Copy files
+###
+COPY ./data/php-ini.d/php-8.0.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-8.0.conf /usr/local/etc/php-fpm.conf
+
+COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
+COPY ./data/docker-entrypoint.d/*.sh /docker-entrypoint.d/
+COPY ./data/bash-devilbox /etc/bash-devilbox
+COPY ./data/sudo-devilbox /etc/sudoers.d/devilbox
+
+
+
+###
+### Volumes
+###
+VOLUME /shared/backups
+VOLUME /var/log/php
+VOLUME /var/mail
+
+
+###
+### Ports
+###
+EXPOSE 9000
+
+
+###
+### Where to start inside the container
+###
+WORKDIR /shared/httpd
+
+
+###
+### Entrypoint
+###
+ENTRYPOINT ["/docker-entrypoint.sh"]

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
 
 
@@ -209,7 +209,8 @@ update_ca_certificates "/ca" "${DEBUG_LEVEL}"
 ###
 ### Run custom user supplied scripts
 ###
-execute_custom_scripts "/startup.d" "${DEBUG_LEVEL}"
+execute_custom_scripts "/startup.1.d" "${DEBUG_LEVEL}"
+execute_custom_scripts "/startup.2.d" "${DEBUG_LEVEL}"
 
 
 ###

Dockerfiles/work/data/php-fpm.conf/php-fpm-8.0.conf

@@ -0,0 +1,134 @@
+; ################################################################################
+; ####
+; #### The following settings can be overwritten by later includes
+; ####
+; ################################################################################
+
+
+; ############################################################
+; Timeouts
+; ############################################################
+
+[www]
+; The timeout for serving a single request after which the worker process will be killed.
+; This option should be used when the 'max_execution_time' ini option does not stop script
+; execution for some reason.
+request_terminate_timeout = 120s
+
+
+; ############################################################
+; Logging
+; ############################################################
+
+[global]
+error_log = /proc/self/fd/2
+log_level = notice
+
+[www]
+; if we send this to /proc/self/fd/1, it never appears
+access.log = /proc/self/fd/2
+
+
+; ############################################################
+; Backlog configuration
+; ############################################################
+
+[www]
+; A maximum of backlog incoming connections will be queued for processing.
+; If a connection request arrives with the queue full the client may receive an error with an
+; indication of ECONNREFUSED, or, if the underlying protocol supports retransmission,
+; the request may be ignored so that retries may succeed.
+
+; This should not be greater than `cat /proc/sys/net/core/somaxconn`, otherwise connections
+; are silently truncated
+listen.backlog = 1024
+
+
+; ############################################################
+; Worker configuration
+; ############################################################
+
+[www]
+; static - the number of child processes is fixed (pm.max_children).
+;
+; dynamic - the number of child processes is set dynamically based on the following directives:
+; pm.max_children, pm.start_servers, pm.min_spare_servers, pm.max_spare_servers.
+;
+; ondemand - the processes spawn on demand (when requested, as opposed to dynamic, where
+; pm.start_servers are started when the service is started.
+pm = ondemand
+
+; The maximum number of child processes to be created
+pm.max_children = 50
+
+; The number of child processes created on startup. Used only when pm is set to dynamic.
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2.
+pm.start_servers = 4
+
+; The desired minimum number of idle server processes.
+pm.min_spare_servers = 2
+
+; The desired maximum number of idle server processes.
+pm.max_spare_servers = 6
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries.
+; For endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default value: 0.
+pm.max_requests = 500
+
+; The number of seconds after which an idle process will be killed. Used only when pm is set to ondemand
+pm.process_idle_timeout = 10s
+
+
+; ############################################################
+; Include
+; ############################################################
+
+
+[global]
+include   = /usr/local/etc/php-fpm.d/*.conf
+
+
+; ################################################################################
+; ####
+; #### The following settings overwrite any includes again
+; ####
+; ################################################################################
+
+
+; ############################################################
+; Required for Dockerization
+; ############################################################
+
+[global]
+daemonize = no
+
+[www]
+; Keep env variables set by docker
+clear_env = no
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environement, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+catch_workers_output = yes
+
+
+; ############################################################
+; User and Group
+; ############################################################
+
+[www]
+user  = devilbox
+group = devilbox
+
+
+; ############################################################
+; Networking
+; ############################################################
+
+[www]
+; Ensure to listen here
+listen         = 9000

Dockerfiles/work/data/php-ini.d/php-8.0.ini

@@ -0,0 +1,49 @@
+; ############################################################
+; # Devilbox PHP defaults for 8.0-work
+; ############################################################
+
+; Each PHP flavour (base, mods, prod, work) might have its own php.ini.
+; If none is present, the one from the previous flavour is inherited.
+
+
+[PHP]
+
+; Memory
+; Note: "memory_limit" should be larger than "post_max_size"
+memory_limit            = 512M
+
+
+; Timeouts
+max_execution_time      = 120
+max_input_time          = 120
+
+
+; Uploads
+; Note: "post_max_size" should be greater than "upload_max_filesize"
+post_max_size           = 72M
+upload_max_filesize     = 64M
+max_file_uploads        = 20
+
+
+; Vars
+variables_order         = EGPCS
+max_input_vars          = 8000
+max_input_nesting_level = 64
+
+
+; Error reporting
+; Note: error_log is dynamic and handled during start to set appropriate setting
+error_reporting         = E_ALL | E_NOTICE | E_STRICT | E_DEPRECATED
+xmlrpc_errors           = Off
+report_memleaks         = On
+display_errors          = On
+display_startup_errors  = On
+log_errors              = On
+html_errors             = On
+
+
+; Xdebug settings
+xdebug.default_enable   = Off
+xdebug.profiler_enable  = Off
+xdebug.remote_enable    = Off
+xdebug.remote_autostart = Off

Makefile

@@ -37,6 +37,7 @@ help:
 	@printf "%s\n" "make build-base-72:      Build PHP 7.2 base image"
 	@printf "%s\n" "make build-base-73:      Build PHP 7.3 base image"
 	@printf "%s\n" "make build-base-74:      Build PHP 7.4 base image"
+	@printf "%s\n" "make build-base-80:      Build PHP 8.0 base image"
 	@printf "\n"
 	@printf "%s\n" "make build-mods-52:      Build PHP 5.2 mods image"
 	@printf "%s\n" "make build-mods-53:      Build PHP 5.3 mods image"
@@ -48,6 +49,7 @@ help:
 	@printf "%s\n" "make build-mods-72:      Build PHP 7.2 mods image"
 	@printf "%s\n" "make build-mods-73:      Build PHP 7.3 mods image"
 	@printf "%s\n" "make build-mods-74:      Build PHP 7.4 mods image"
+	@printf "%s\n" "make build-mods-80:      Build PHP 8.0 mods image"
 	@printf "\n"
 	@printf "%s\n" "make build-prod-52:      Build PHP 5.2 prod image"
 	@printf "%s\n" "make build-prod-53:      Build PHP 5.3 prod image"
@@ -59,6 +61,7 @@ help:
 	@printf "%s\n" "make build-prod-72:      Build PHP 7.2 prod image"
 	@printf "%s\n" "make build-prod-73:      Build PHP 7.3 prod image"
 	@printf "%s\n" "make build-prod-74:      Build PHP 7.4 prod image"
+	@printf "%s\n" "make build-prod-80:      Build PHP 8.0 prod image"
 	@printf "\n"
 	@printf "%s\n" "make build-work-52:      Build PHP 5.2 work image"
 	@printf "%s\n" "make build-work-53:      Build PHP 5.3 work image"
@@ -70,6 +73,7 @@ help:
 	@printf "%s\n" "make build-work-72:      Build PHP 7.2 work image"
 	@printf "%s\n" "make build-work-73:      Build PHP 7.3 work image"
 	@printf "%s\n" "make build-work-74:      Build PHP 7.4 work image"
+	@printf "%s\n" "make build-work-80:      Build PHP 8.0 work image"
 	@printf "\n"
 	@printf "%s\n" "make rebuild-base-52:    Build PHP 5.2 base image"
 	@printf "%s\n" "make rebuild-base-53:    Build PHP 5.3 base image"
@@ -81,6 +85,7 @@ help:
 	@printf "%s\n" "make rebuild-base-72:    Build PHP 7.2 base image"
 	@printf "%s\n" "make rebuild-base-73:    Build PHP 7.3 base image"
 	@printf "%s\n" "make rebuild-base-74:    Build PHP 7.4 base image"
+	@printf "%s\n" "make rebuild-base-80:    Build PHP 8.0 base image"
 	@printf "\n"
 	@printf "%s\n" "make rebuild-mods-52:    Build PHP 5.2 mods image"
 	@printf "%s\n" "make rebuild-mods-53:    Build PHP 5.3 mods image"
@@ -92,6 +97,7 @@ help:
 	@printf "%s\n" "make rebuild-mods-72:    Build PHP 7.2 mods image"
 	@printf "%s\n" "make rebuild-mods-73:    Build PHP 7.3 mods image"
 	@printf "%s\n" "make rebuild-mods-74:    Build PHP 7.4 mods image"
+	@printf "%s\n" "make rebuild-mods-80:    Build PHP 8.0 mods image"
 	@printf "\n"
 	@printf "%s\n" "make rebuild-prod-52:    Build PHP 5.2 prod image"
 	@printf "%s\n" "make rebuild-prod-53:    Build PHP 5.3 prod image"
@@ -103,6 +109,7 @@ help:
 	@printf "%s\n" "make rebuild-prod-72:    Build PHP 7.2 prod image"
 	@printf "%s\n" "make rebuild-prod-73:    Build PHP 7.3 prod image"
 	@printf "%s\n" "make rebuild-prod-74:    Build PHP 7.4 prod image"
+	@printf "%s\n" "make rebuild-prod-80:    Build PHP 8.0 prod image"
 	@printf "\n"
 	@printf "%s\n" "make rebuild-work-52:    Build PHP 5.2 work image"
 	@printf "%s\n" "make rebuild-work-53:    Build PHP 5.3 work image"
@@ -114,6 +121,7 @@ help:
 	@printf "%s\n" "make rebuild-work-72:    Build PHP 7.2 work image"
 	@printf "%s\n" "make rebuild-work-73:    Build PHP 7.3 work image"
 	@printf "%s\n" "make rebuild-work-74:    Build PHP 7.4 work image"
+	@printf "%s\n" "make rebuild-work-80:    Build PHP 8.0 work image"
 
 
 
@@ -149,15 +157,15 @@ rebuild-all: rebuild-base rebuild-mods rebuild-prod rebuild-work
 ###
 ### Build categories
 ###
-build-base: build-base-52 build-base-53 build-base-54 build-base-55 build-base-56 build-base-70 build-base-71 build-base-72 build-base-73 build-base-74
-build-mods: build-mods-52 build-mods-53 build-mods-54 build-mods-55 build-mods-56 build-mods-70 build-mods-71 build-mods-72 build-mods-73 build-mods-74
-build-prod: build-prod-52 build-prod-53 build-prod-54 build-prod-55 build-prod-56 build-prod-70 build-prod-71 build-prod-72 build-prod-73 build-prod-74
-build-work: build-work-52 build-work-53 build-work-54 build-work-55 build-work-56 build-work-70 build-work-71 build-work-72 build-work-73 build-work-74
+build-base: build-base-52 build-base-53 build-base-54 build-base-55 build-base-56 build-base-70 build-base-71 build-base-72 build-base-73 build-base-74 build-base-80
+build-mods: build-mods-52 build-mods-53 build-mods-54 build-mods-55 build-mods-56 build-mods-70 build-mods-71 build-mods-72 build-mods-73 build-mods-74 build-mods-80
+build-prod: build-prod-52 build-prod-53 build-prod-54 build-prod-55 build-prod-56 build-prod-70 build-prod-71 build-prod-72 build-prod-73 build-prod-74 build-prod-80
+build-work: build-work-52 build-work-53 build-work-54 build-work-55 build-work-56 build-work-70 build-work-71 build-work-72 build-work-73 build-work-74 build-work-80
 
-rebuild-base: rebuild-base-52 rebuild-base-53 rebuild-base-54 rebuild-base-55 rebuild-base-56 rebuild-base-70 rebuild-base-71 rebuild-base-72 rebuild-base-73 rebuild-base-74
-rebuild-mods: rebuild-mods-52 rebuild-mods-53 rebuild-mods-54 rebuild-mods-55 rebuild-mods-56 rebuild-mods-70 rebuild-mods-71 rebuild-mods-72 rebuild-mods-73 rebuild-mods-74
-rebuild-prod: rebuild-prod-52 rebuild-prod-53 rebuild-prod-54 rebuild-prod-55 rebuild-prod-56 rebuild-prod-70 rebuild-prod-71 rebuild-prod-72 rebuild-prod-73 rebuild-prod-74
-rebuild-work: rebuild-work-52 rebuild-work-53 rebuild-work-54 rebuild-work-55 rebuild-work-56 rebuild-work-70 rebuild-work-71 rebuild-work-72 rebuild-work-73 rebuild-work-74
+rebuild-base: rebuild-base-52 rebuild-base-53 rebuild-base-54 rebuild-base-55 rebuild-base-56 rebuild-base-70 rebuild-base-71 rebuild-base-72 rebuild-base-73 rebuild-base-74 rebuild-base-80
+rebuild-mods: rebuild-mods-52 rebuild-mods-53 rebuild-mods-54 rebuild-mods-55 rebuild-mods-56 rebuild-mods-70 rebuild-mods-71 rebuild-mods-72 rebuild-mods-73 rebuild-mods-74 rebuild-mods-80
+rebuild-prod: rebuild-prod-52 rebuild-prod-53 rebuild-prod-54 rebuild-prod-55 rebuild-prod-56 rebuild-prod-70 rebuild-prod-71 rebuild-prod-72 rebuild-prod-73 rebuild-prod-74 rebuild-prod-80
+rebuild-work: rebuild-work-52 rebuild-work-53 rebuild-work-54 rebuild-work-55 rebuild-work-56 rebuild-work-70 rebuild-work-71 rebuild-work-72 rebuild-work-73 rebuild-work-74 rebuild-work-80
 
 
 
@@ -184,6 +192,8 @@ build-base-73: pull-from-73
 	docker build -t devilbox/php-fpm:7.3-base -f $(location)/base/Dockerfile-7.3 $(location)/base
 build-base-74: pull-from-74
 	docker build -t devilbox/php-fpm:7.4-base -f $(location)/base/Dockerfile-7.4 $(location)/base
+build-base-80: pull-from-80
+	docker build -t devilbox/php-fpm:8.0-base -f $(location)/base/Dockerfile-8.0 $(location)/base
 
 build-mods-52:
 	docker build -t devilbox/php-fpm:5.2-mods -f $(location)/mods/Dockerfile-5.2 $(location)/mods
@@ -205,6 +215,8 @@ build-mods-73:
 	docker build -t devilbox/php-fpm:7.3-mods -f $(location)/mods/Dockerfile-7.3 $(location)/mods
 build-mods-74:
 	docker build -t devilbox/php-fpm:7.4-mods -f $(location)/mods/Dockerfile-7.4 $(location)/mods
+build-mods-80:
+	docker build -t devilbox/php-fpm:8.0-mods -f $(location)/mods/Dockerfile-8.0 $(location)/mods
 
 build-prod-52:
 	docker build -t devilbox/php-fpm:5.2-prod -f $(location)/prod/Dockerfile-5.2 $(location)/prod
@@ -226,6 +238,8 @@ build-prod-73:
 	docker build -t devilbox/php-fpm:7.3-prod -f $(location)/prod/Dockerfile-7.3 $(location)/prod
 build-prod-74:
 	docker build -t devilbox/php-fpm:7.4-prod -f $(location)/prod/Dockerfile-7.4 $(location)/prod
+build-prod-80:
+	docker build -t devilbox/php-fpm:8.0-prod -f $(location)/prod/Dockerfile-8.0 $(location)/prod
 
 build-work-52:
 	docker build -t devilbox/php-fpm:5.2-work -f $(location)/work/Dockerfile-5.2 $(location)/work
@@ -247,6 +261,8 @@ build-work-73:
 	docker build -t devilbox/php-fpm:7.3-work -f $(location)/work/Dockerfile-7.3 $(location)/work
 build-work-74:
 	docker build -t devilbox/php-fpm:7.4-work -f $(location)/work/Dockerfile-7.4 $(location)/work
+build-work-80:
+	docker build -t devilbox/php-fpm:8.0-work -f $(location)/work/Dockerfile-8.0 $(location)/work
 
 
 
@@ -273,6 +289,8 @@ rebuild-base-73: pull-from-73
 	docker build --no-cache -t devilbox/php-fpm:7.3-base -f $(location)/base/Dockerfile-7.3 $(location)/base
 rebuild-base-74: pull-from-74
 	docker build --no-cache -t devilbox/php-fpm:7.4-base -f $(location)/base/Dockerfile-7.4 $(location)/base
+rebuild-base-80: pull-from-80
+	docker build --no-cache -t devilbox/php-fpm:8.0-base -f $(location)/base/Dockerfile-8.0 $(location)/base
 
 rebuild-mods-52:
 	docker build --no-cache -t devilbox/php-fpm:5.2-mods -f $(location)/mods/Dockerfile-5.2 $(location)/mods
@@ -294,6 +312,8 @@ rebuild-mods-73:
 	docker build --no-cache -t devilbox/php-fpm:7.3-mods -f $(location)/mods/Dockerfile-7.3 $(location)/mods
 rebuild-mods-74:
 	docker build --no-cache -t devilbox/php-fpm:7.4-mods -f $(location)/mods/Dockerfile-7.4 $(location)/mods
+rebuild-mods-80:
+	docker build --no-cache -t devilbox/php-fpm:8.0-mods -f $(location)/mods/Dockerfile-8.0 $(location)/mods
 
 rebuild-prod-52:
 	docker build --no-cache -t devilbox/php-fpm:5.2-prod -f $(location)/prod/Dockerfile-5.2 $(location)/prod
@@ -315,6 +335,8 @@ rebuild-prod-73:
 	docker build --no-cache -t devilbox/php-fpm:7.3-prod -f $(location)/prod/Dockerfile-7.3 $(location)/prod
 rebuild-prod-74:
 	docker build --no-cache -t devilbox/php-fpm:7.4-prod -f $(location)/prod/Dockerfile-7.4 $(location)/prod
+rebuild-prod-80:
+	docker build --no-cache -t devilbox/php-fpm:8.0-prod -f $(location)/prod/Dockerfile-8.0 $(location)/prod
 
 rebuild-work-52:
 	docker build --no-cache -t devilbox/php-fpm:5.2-work -f $(location)/work/Dockerfile-5.2 $(location)/work
@@ -336,6 +358,8 @@ rebuild-work-73:
 	docker build --no-cache -t devilbox/php-fpm:7.3-work -f $(location)/work/Dockerfile-7.3 $(location)/work
 rebuild-work-74:
 	docker build --no-cache -t devilbox/php-fpm:7.4-work -f $(location)/work/Dockerfile-7.4 $(location)/work
+rebuild-work-80:
+	docker build --no-cache -t devilbox/php-fpm:8.0-work -f $(location)/work/Dockerfile-8.0 $(location)/work
 
 
 
@@ -362,6 +386,8 @@ pull-from-73:
 	docker pull $(shell grep FROM $(location)/base/Dockerfile-7.3 | sed 's/^FROM\s*//g';)
 pull-from-74:
 	docker pull $(shell grep FROM $(location)/base/Dockerfile-7.4 | sed 's/^FROM\s*//g';)
+pull-from-80:
+	docker pull $(shell grep FROM $(location)/base/Dockerfile-8.0 | sed 's/^FROM\s*//g';)
 
 
 ###
@@ -369,10 +395,10 @@ pull-from-74:
 ###
 test-all: test-base test-mods test-prod test-work
 
-test-base: test-base-52 test-base-53 test-base-54 test-base-55 test-base-56 test-base-70 test-base-71 test-base-72 test-base-73 test-base-74
-test-mods: test-mods-52 test-mods-53 test-mods-54 test-mods-55 test-mods-56 test-mods-70 test-mods-71 test-mods-72 test-mods-73 test-mods-74
-test-prod: test-prod-52 test-prod-53 test-prod-54 test-prod-55 test-prod-56 test-prod-70 test-prod-71 test-prod-72 test-prod-73 test-prod-74
-test-work: test-work-52 test-work-53 test-work-54 test-work-55 test-work-56 test-work-70 test-work-71 test-work-72 test-work-73 test-work-74
+test-base: test-base-52 test-base-53 test-base-54 test-base-55 test-base-56 test-base-70 test-base-71 test-base-72 test-base-73 test-base-74 test-base-80
+test-mods: test-mods-52 test-mods-53 test-mods-54 test-mods-55 test-mods-56 test-mods-70 test-mods-71 test-mods-72 test-mods-73 test-mods-74 test-mods-80
+test-prod: test-prod-52 test-prod-53 test-prod-54 test-prod-55 test-prod-56 test-prod-70 test-prod-71 test-prod-72 test-prod-73 test-prod-74 test-prod-80
+test-work: test-work-52 test-work-53 test-work-54 test-work-55 test-work-56 test-work-70 test-work-71 test-work-72 test-work-73 test-work-74 test-work-80
 
 
 ###
@@ -398,6 +424,8 @@ test-base-73:
 	./tests/test.sh 7.3 base
 test-base-74:
 	./tests/test.sh 7.4 base
+test-base-80:
+	./tests/test.sh 8.0 base
 
 test-mods-52:
 	./tests/test.sh 5.2 mods
@@ -419,6 +447,8 @@ test-mods-73:
 	./tests/test.sh 7.3 mods
 test-mods-74:
 	./tests/test.sh 7.4 mods
+test-mods-80:
+	./tests/test.sh 8.0 mods
 
 test-prod-52:
 	./tests/test.sh 5.2 prod
@@ -440,6 +470,8 @@ test-prod-73:
 	./tests/test.sh 7.3 prod
 test-prod-74:
 	./tests/test.sh 7.4 prod
+test-prod-80:
+	./tests/test.sh 8.0 prod
 
 test-work-52:
 	./tests/test.sh 5.2 work
@@ -461,3 +493,5 @@ test-work-73:
 	./tests/test.sh 7.3 work
 test-work-74:
 	./tests/test.sh 7.4 work
+test-work-80:
+	./tests/test.sh 8.0 work

README.md

@@ -1,21 +1,65 @@
 # PHP-FPM Docker images
 
 [![Build Status](https://travis-ci.org/devilbox/docker-php-fpm.svg?branch=master)](https://travis-ci.org/devilbox/docker-php-fpm)
-[![release](https://img.shields.io/github/release/devilbox/docker-php-fpm.svg)](https://github.com/devilbox/docker-php-fpm/releases)
-[![Join the chat at https://gitter.im/devilbox/Lobby](https://badges.gitter.im/devilbox/Lobby.svg)](https://gitter.im/devilbox/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Github](https://img.shields.io/badge/github-docker--php--fpm-red.svg)](https://github.com/devilbox/docker-php-fpm)
-[![](https://images.microbadger.com/badges/license/devilbox/php-fpm.svg)](https://microbadger.com/images/devilbox/php-fpm "php-fpm")
-
-**[devilbox/docker-php-fpm](https://github.com/devilbox/docker-php-fpm)**
+[![Release](https://img.shields.io/github/release/devilbox/docker-php-fpm.svg?colorB=orange)](https://github.com/devilbox/docker-php-fpm/releases)
+[![Gitter](https://badges.gitter.im/devilbox/Lobby.svg)](https://gitter.im/devilbox/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Discourse](https://img.shields.io/discourse/https/devilbox.discourse.group/status.svg?colorB=%234CB697)](https://devilbox.discourse.group)
+[![License](https://img.shields.io/badge/license-MIT-%233DA639.svg)](https://opensource.org/licenses/MIT)
 
 This repository will provide you fully functional PHP-FPM Docker images in different flavours,
-versions and packed with different types of integrated PHP modules. It also solves the problem of [syncronizing file permissions](#unsynchronized-permissions) of mounted volumes between the host and the container.
+versions and packed with different types of integrated PHP modules. It also solves the problem of **[syncronizing file permissions](#unsynchronized-permissions)** of mounted volumes between the host and the container.
 
 | Docker Hub | Upstream Project |
 |------------|------------------|
 | <a href="https://hub.docker.com/r/devilbox/php-fpm"><img height="82px" src="http://dockeri.co/image/devilbox/php-fpm" /></a> | <a href="https://github.com/cytopia/devilbox" ><img height="82px" src="https://raw.githubusercontent.com/devilbox/artwork/master/submissions_banner/cytopia/01/png/banner_256_trans.png" /></a> |
 
----
+#### Base Images
+
+Have a look at the following Devilbox base images for which no official versions exist yet, but are required to serve as a foundation for this repository:
+
+* [PHP-FPM 5.2](https://github.com/devilbox/docker-php-fpm-5.2)
+* [PHP-FPM 5.3](https://github.com/devilbox/docker-php-fpm-5.3)
+* [PHP-FPM 7.4](https://github.com/devilbox/docker-php-fpm-7.4)
+* [PHP-FPM 8.0](https://github.com/devilbox/docker-php-fpm-8.0)
+
+#### Documentation
+
+In case you seek help, go and visit the community pages.
+
+<table width="100%" style="width:100%; display:table;">
+ <thead>
+  <tr>
+   <th width="33%" style="width:33%;"><h3><a target="_blank" href="https://devilbox.readthedocs.io">Documentation</a></h3></th>
+   <th width="33%" style="width:33%;"><h3><a target="_blank" href="https://gitter.im/devilbox/Lobby">Chat</a></h3></th>
+   <th width="33%" style="width:33%;"><h3><a target="_blank" href="https://devilbox.discourse.group">Forum</a></h3></th>
+  </tr>
+ </thead>
+ <tbody style="vertical-align: middle; text-align: center;">
+  <tr>
+   <td>
+    <a target="_blank" href="https://devilbox.readthedocs.io">
+     <img title="Documentation" name="Documentation" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/readthedocs.png" />
+    </a>
+   </td>
+   <td>
+    <a target="_blank" href="https://gitter.im/devilbox/Lobby">
+     <img title="Chat on Gitter" name="Chat on Gitter" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/gitter.png" />
+    </a>
+   </td>
+   <td>
+    <a target="_blank" href="https://devilbox.discourse.group">
+     <img title="Devilbox Forums" name="Forum" src="https://raw.githubusercontent.com/cytopia/icons/master/400x400/discourse.png" />
+    </a>
+   </td>
+  </tr>
+  <tr>
+  <td><a target="_blank" href="https://devilbox.readthedocs.io">devilbox.readthedocs.io</a></td>
+  <td><a target="_blank" href="https://gitter.im/devilbox/Lobby">gitter.im/devilbox</a></td>
+  <td><a target="_blank" href="https://devilbox.discourse.group">devilbox.discourse.group</a></td>
+  </tr>
+ </tbody>
+</table>
+
 
 #### Table of Contents
 
@@ -173,7 +217,7 @@ The following table shows a more complete overview about the offered Docker imag
  <tbody>
 
   <tr>
-   <td rowspan="10"><strong>base</strong></td>
+   <td rowspan="11"><strong>base</strong></td>
    <td><code>devilbox/php-fpm:5.2-base</code></td>
    <td>
     <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/image/devilbox/php-fpm:5.2-base.svg" /></a>
@@ -242,9 +286,16 @@ The following table shows a more complete overview about the offered Docker imag
     <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/version/devilbox/php-fpm:7.4-base.svg" /></a>
    </td>
   </tr>
+  <tr>
+   <td><code>devilbox/php-fpm:8.0-base</code></td>
+   <td>
+    <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/image/devilbox/php-fpm:8.0-base.svg" /></a>
+    <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/version/devilbox/php-fpm:8.0-base.svg" /></a>
+   </td>
+  </tr>
 
   <tr>
-   <td rowspan="10"><strong>mods</strong></td>
+   <td rowspan="11"><strong>mods</strong></td>
    <td><code>devilbox/php-fpm:5.2-mods</code></td>
    <td>
     <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/image/devilbox/php-fpm:5.2-mods.svg" /></a>
@@ -314,9 +365,16 @@ The following table shows a more complete overview about the offered Docker imag
     <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/version/devilbox/php-fpm:7.4-mods.svg" /></a>
    </td>
   </tr>
+  <tr>
+   <td><code>devilbox/php-fpm:8.0-mods</code></td>
+   <td>
+    <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/image/devilbox/php-fpm:8.0-mods.svg" /></a>
+    <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/version/devilbox/php-fpm:8.0-mods.svg" /></a>
+   </td>
+  </tr>
 
   <tr>
-   <td rowspan="10"><strong>prod</strong></td>
+   <td rowspan="11"><strong>prod</strong></td>
    <td><code>devilbox/php-fpm:5.2-prod</code></td>
    <td>
     <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/image/devilbox/php-fpm:5.2-prod.svg" /></a>
@@ -386,9 +444,16 @@ The following table shows a more complete overview about the offered Docker imag
     <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/version/devilbox/php-fpm:7.4-prod.svg" /></a>
    </td>
   </tr>
+  <tr>
+   <td><code>devilbox/php-fpm:8.0-prod</code></td>
+   <td>
+    <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/image/devilbox/php-fpm:8.0-prod.svg" /></a>
+    <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/version/devilbox/php-fpm:8.0-prod.svg" /></a>
+   </td>
+  </tr>
 
   <tr>
-   <td rowspan="10"><strong>work</strong></td>
+   <td rowspan="11"><strong>work</strong></td>
    <td><code>devilbox/php-fpm:5.2-work</code></td>
    <td>
     <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/image/devilbox/php-fpm:5.2-work.svg" /></a>
@@ -458,6 +523,13 @@ The following table shows a more complete overview about the offered Docker imag
     <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/version/devilbox/php-fpm:7.4-work.svg" /></a>
    </td>
   </tr>
+  <tr>
+   <td><code>devilbox/php-fpm:8.0-work</code></td>
+   <td>
+    <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/image/devilbox/php-fpm:8.0-work.svg" /></a>
+    <a href="https://microbadger.com/images/devilbox/php-fpm"><img src="https://images.microbadger.com/badges/version/devilbox/php-fpm:8.0-work.svg" /></a>
+   </td>
+  </tr>
 
  </tbody>
 </table>
@@ -526,52 +598,57 @@ 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, pdo_sqlsrv, pgsql, phalcon, Phar, posix, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="70-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, 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, pdo_sqlsrv, pgsql, phalcon, Phar, posix, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="71-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, 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, pdo_sqlsrv, pgsql, phalcon, Phar, posix, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, sqlsrv, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="72-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, 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, pdo_sqlsrv, pgsql, 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>
+   <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, mcrypt, 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>
+  <tr>
+   <th>8.0</th>
+   <td id="80-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="80-mods">bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, 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, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
  </tbody>
 </table>
@@ -592,6 +669,7 @@ docker pull devilbox/php-fpm:7.1-base
 docker pull devilbox/php-fpm:7.2-base
 docker pull devilbox/php-fpm:7.3-base
 docker pull devilbox/php-fpm:7.4-base
+docker pull devilbox/php-fpm:8.0-base
 ```
 
 Generic PHP-FPM base image. Use it to derive your own php-fpm docker image from it and add more extensions, tools and injectables.<br/><br/><sub>(Does not offer any environment variables except for `NEW_UID` and `NEW_GID`)</sub>
@@ -608,6 +686,7 @@ docker pull devilbox/php-fpm:7.1-mods
 docker pull devilbox/php-fpm:7.2-mods
 docker pull devilbox/php-fpm:7.3-mods
 docker pull devilbox/php-fpm:7.4-mods
+docker pull devilbox/php-fpm:8.0-mods
 ```
 
 Generic PHP-FPM image with fully loaded extensions. Use it to derive your own php-fpm docker image from it and add more extensions, tools and injectables.<br/><br/><sub>(Does not offer any environment variables except for `NEW_UID` and `NEW_GID`)</sub></td>
@@ -624,6 +703,7 @@ docker pull devilbox/php-fpm:7.1-prod
 docker pull devilbox/php-fpm:7.2-prod
 docker pull devilbox/php-fpm:7.3-prod
 docker pull devilbox/php-fpm:7.4-prod
+docker pull devilbox/php-fpm:8.0-prod
 ```
 
 Devilbox production image. This Docker image comes with many injectables, port-forwardings, mail-catch-all and user/group rewriting.
@@ -640,6 +720,7 @@ docker pull devilbox/php-fpm:7.1-work
 docker pull devilbox/php-fpm:7.2-work
 docker pull devilbox/php-fpm:7.3-work
 docker pull devilbox/php-fpm:7.4-work
+docker pull devilbox/php-fpm:8.0-work
 ```
 
 Devilbox development image. Same as prod, but comes with lots of locally installed tools to make development inside the container as convenient as possible. See [Integrated Development Environment](#integrated-development-environment) for more information about this.
@@ -701,7 +782,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 +841,7 @@ Have a look at the following table to see all offered volumes for each Docker im
  </thead>
  <tbody>
   <tr>
-   <td rowspan="6"><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>
@@ -773,8 +854,12 @@ Have a look at the following table to see all offered volumes for each Docker im
    <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.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.</td>
+   <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>
@@ -963,6 +1048,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-base.j2

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

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-work.j2

@@ -70,6 +70,7 @@ RUN set -x \
 		automake \
 		bash-completion \
 		binutils \
+		blackfire-agent \
 		build-essential \
 		bzip2 \
 		coreutils \
@@ -124,9 +125,9 @@ RUN set -x \
 		w3m \
 		wget \
 		whois \
-		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/* \

build/ansible/group_vars/all.yml

@@ -19,6 +19,7 @@ php_all_versions:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
 
 
 ###
@@ -185,6 +186,7 @@ compose_home: /usr/local/src/composer
 ###
 apt_repositories_enabled:
   - backports
+  - blackfire
   - git
   - mongo
   - node
@@ -218,11 +220,14 @@ software_enabled:
   - phalcon
   - phpcs
   - phpcbf
+  - php-cs-fixer
   - phpunit
   - photon
+  - pm2
   - sass
   - symfony
   - webpack
+  - wkhtmltopdf
   - wpcli
   - yamllint
   # Cleanup needs to be last
@@ -245,6 +250,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
@@ -252,6 +261,8 @@ apt_repositories_available:
       deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
     7.4:
       deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
+    8.0:
+      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu artful main
     all:
       deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main
       key: A1715D88E1DF1F24
@@ -266,6 +277,8 @@ apt_repositories_available:
       deb: deb http://deb.nodesource.com/node_8.x stretch main
     7.4:
       deb: deb http://deb.nodesource.com/node_8.x stretch main
+    8.0:
+      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 -sS "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
@@ -276,6 +289,8 @@ apt_repositories_available:
       deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
     7.4:
       deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+    8.0:
+      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 -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
@@ -300,7 +315,7 @@ apt_repositories_available:
 #
 software_available:
   asgardcms:
-    disabled: [5.2, 5.3, 5.4]
+    disabled: [5.2, 5.3, 5.4, 8.0]
     check: asgardcms --version 2>/dev/null | grep -Ei 'AsgardCMS\sInstaller\s[.0-9]+'
     all:
       command: |
@@ -347,12 +362,21 @@ 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]
+    disabled: [5.2, 8.0]
     check: drush7 --version | grep -E '7[.0-9]+\s*$'
     all:
       pre: |
@@ -368,7 +392,7 @@ software_available:
         && rm -rf /usr/local/src/drush7/examples \
         && rm -rf /usr/local/src/drush7/misc \
   drush8:
-    disabled: [5.2, 5.3]
+    disabled: [5.2, 5.3, 8.0]
     check: drush8 --version | grep -E '8[.0-9]+\s*$'
     all:
       pre: |
@@ -384,7 +408,7 @@ software_available:
         && rm -rf /usr/local/src/drush8/examples \
         && rm -rf /usr/local/src/drush8/misc \
   drush9:
-    disabled: [5.2, 5.3, 5.4, 5.5]
+    disabled: [5.2, 5.3, 5.4, 5.5, 8.0]
     check: drush9 --version | grep -E '9[.0-9]+\s*$'
     all:
       pre: |
@@ -400,7 +424,7 @@ software_available:
         && rm -rf /usr/local/src/drush9/examples \
         && rm -rf /usr/local/src/drush9/misc \
   codeception:
-    disabled: [5.2]
+    disabled: [5.2, 8.0]
     check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$'
     all:
       command: |
@@ -429,7 +453,7 @@ software_available:
         && rm -rf /tmp/y \
   laravel:
     check: laravel --version | grep -E '(Installer|version)\s*[.0-9]+'
-    disabled: [5.2, 5.3]
+    disabled: [5.2, 5.3, 8.0]
     5.4:
       pre: |
         git clone https://github.com/laravel/installer /usr/local/src/laravel-installer \
@@ -510,7 +534,7 @@ software_available:
         && cd / \
         && rm -rf /usr/local/src/mysqldump-secure \
   phalcon:
-    disabled: [5.2, 7.3, 7.4]
+    disabled: [5.2, 7.3, 7.4, 8.0]
     check: phalcon commands | grep -E '[.0-9]+'
     5.3:
       pre: |
@@ -537,32 +561,51 @@ 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, 8.0]
+    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]
+    disabled: [5.2, 8.0]
     check: phpunit --version | grep -iE '^PHPUnit\s[.0-9]+'
     5.3:
       command: |
@@ -589,12 +632,17 @@ software_available:
         curl -qL https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \
         && chmod +x /usr/local/bin/phpunit \
   photon:
-    disabled: [5.2, 5.3, 5.4]
+    disabled: [5.2, 5.3, 5.4, 8.0]
     check: photon --version | grep -E 'Installer [.0-9]+'
     all:
       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:
@@ -605,6 +653,28 @@ software_available:
     all:
       command: curl https://symfony.com/installer -L -o /usr/local/bin/symfony
       post: chmod +x /usr/local/bin/symfony
+  wkhtmltopdf:
+    check: wkhtmltopdf --version | grep -E "^wkhtmltopdf [.0-9]+\s+\(.+patched.+\)"
+    5.2:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+    5.3:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+    5.4:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+    5.5:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+jessie_amd64\.deb' | head -1 )"
+    all:
+      pre: VERSION="$( curl -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )"
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+        && curl -sS -L -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
+        && dpkg -i /tmp/wkhtmltopdf.deb \
+        && rm -f /tmp/wkhtmltopdf.deb \
+      post: |
+        DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+        && rm -rf /var/lib/apt/lists/* \
   wpcli:
     disabled: [5.2]
     check: wp --allow-root --version | grep -E '[.0-9]+'
@@ -670,6 +740,7 @@ extensions_enabled:
   - amqp
   - apcu
   - bcmath
+  - blackfire
   - bz2
   - calendar
   - ctype
@@ -678,6 +749,7 @@ extensions_enabled:
   - dom
   - enchant
   - exif
+  - ffi
   - fileinfo
   - filter
   - ftp
@@ -785,16 +857,22 @@ extensions_enabled:
 #   command:     [required] Custom command to install and enable a module
 extensions_available:
   amqp:
-    disabled: [7.3, 7.4]
+    disabled: [7.3, 7.4, 8.0]
     5.2:
       run_dep: [librabbitmq1]
       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
@@ -802,7 +880,7 @@ extensions_available:
       build_dep: [librabbitmq-dev]
       run_dep: [librabbitmq4]
   apcu:
-    disabled: [5.2, 7.4]
+    disabled: [5.2, 7.4, 8.0]
     5.3:
       type: pecl
       version: 4.0.11
@@ -820,6 +898,17 @@ extensions_available:
   bcmath:
     all:
       type: builtin
+  blackfire:
+    disabled: [5.2, 5.3, 5.4, 5.5, 7.4, 8.0]
+    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
@@ -828,23 +917,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
@@ -856,8 +936,20 @@ 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]
+    already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
     5.2:
       type: pecl
       build_dep: [libmagic-dev]
@@ -866,7 +958,7 @@ extensions_available:
   filter:
     already_avail: "{{ php_all_versions }}" # Available by default
   ftp:
-    already_avail: [5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
+    already_avail: [5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
     all:
       type: builtin
       configure: --with-openssl-dir
@@ -920,6 +1012,9 @@ extensions_available:
     7.4:
       type: builtin
       configure: --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
+    8.0:
+      type: builtin
+      configure: --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
     all:
       type: builtin
       pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/
@@ -936,21 +1031,30 @@ 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:
+    disabled: [8.0]
     5.2:
       type: pecl
       version: 2.0.7
+    5.3:
+      type: pecl
+      version: 2.0.8
+    5.4:
+      type: pecl
+      version: 2.0.8
+    5.5:
+      type: pecl
+      version: 2.0.8
+    5.6:
+      type: pecl
+      version: 2.0.8
     all:
       type: pecl
   imagick:
-    disabled: [5.2, 7.4]
+    disabled: [5.2, 7.4, 8.0]
     5.3:
       type: pecl
       version: 3.3.0
@@ -966,6 +1070,7 @@ extensions_available:
       build_dep: [libmagickwand-dev]
       run_dep: [libmagickwand-6.q16-3]
   imap:
+    disabled: [7.4, 8.0]   # 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/
@@ -995,7 +1100,7 @@ extensions_available:
       build_dep: [libicu-dev]
       run_dep: [libicu57]
   ioncube:
-    disabled: [7.3, 7.4]
+    disabled: [7.3, 7.4, 8.0]
     all:
       type: custom
       command: |
@@ -1009,12 +1114,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
@@ -1024,34 +1124,37 @@ extensions_available:
   libxml:
     already_avail: "{{ php_all_versions }}" # Available by default
   mbstring:
-    already_avail: [5.2, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
+    already_avail: [5.2, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
     all:
       type: builtin
   mcrypt:
-    disabled: [7.3, 7.4]
+    disabled: [7.4, 8.0]
     7.2:
       type: pecl
       version: 1.0.1
     7.3:
       type: pecl
-      version: 1.0.1
+      version: 1.0.2
     all:
       type: builtin
       run_dep: [libmcrypt4]
       build_dep: [libmcrypt-dev]
   memcache:
-    disabled: [7.3, 7.4]
+    disabled: [7.3, 7.4, 8.0]
     7.0:
       type: git
       git_url: https://github.com/websupport-sk/pecl-memcache
+      git_ref: origin/php7
       configure: --with-zlib-dir=/usr
     7.1:
       type: git
       git_url: https://github.com/websupport-sk/pecl-memcache
+      git_ref: origin/php7
       configure: --with-zlib-dir=/usr
     7.2:
       type: git
       git_url: https://github.com/websupport-sk/pecl-memcache
+      git_ref: origin/php7
       configure: --with-zlib-dir=/usr
     all:
       type: pecl
@@ -1072,23 +1175,23 @@ extensions_available:
     5.6:
       type: pecl
       version: 2.2.0
-    7.3:
+    7.4:
       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:
+    8.0:
       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
     all:
       type: pecl
-      version: 3.0.4
+      #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
+    disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0] # Deprecated
     5.2:
       type: pecl
       command: yes | pecl install mongo-1.5.8
@@ -1104,11 +1207,20 @@ extensions_available:
     5.4:
       type: pecl
       version: 1.2.11
+    8.0:
+      type: git
+      git_url: https://github.com/mongodb/mongo-php-driver
+      command: |
+        git submodule update --init \
+        && phpize \
+        && ./configure --enable-mongodb \
+        && make all \
+        && make install \
     all:
       type: pecl
       build_dep: [libssl-dev, libsasl2-dev]
   msgpack:
-    disabled: [7.3, 7.4]
+    disabled: [7.4, 8.0]
     5.2:
       type: pecl
       version: 0.5.7
@@ -1128,7 +1240,7 @@ extensions_available:
       type: pecl
   mysql:
     already_avail: [5.2, 5.3]
-    disabled: [7.0, 7.1, 7.2, 7.3, 7.4] # Deprecated in newer versions
+    disabled: [7.0, 7.1, 7.2, 7.3, 7.4, 8.0] # Deprecated in newer versions
     5.6:
       type: builtin
       run_dep: [libmariadbclient18]
@@ -1141,9 +1253,25 @@ extensions_available:
       type: builtin
   mysqlnd:
     disabled: [5.2]
-    already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 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, 8.0]
   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:
@@ -1159,18 +1287,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
@@ -1189,10 +1313,34 @@ 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]
+    8.0:
+      type: builtin
+      configure: --with-pdo-oci=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3
+    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:
@@ -1201,15 +1349,12 @@ 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]
-    all:
-      type: builtin
-      build_dep: [libsqlite3-dev]
+    already_avail: "{{ php_all_versions }}"
   pdo_sqlsrv:
-    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4]
-    7.3:
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0]
+    7.0:
       type: pecl
-      version: 5.5.0preview
+      version: 5.3.0
       build_dep: [unixodbc-dev]
       run_dep: [unixodbc]
     all:
@@ -1222,7 +1367,7 @@ extensions_available:
       build_dep: [libpq-dev]
       run_dep: [libpq5]
   phalcon:
-    disabled: [5.2, 7.3, 7.4]
+    disabled: [5.2, 7.4, 8.0]
     5.3:
       type: git
       git_url: https://github.com/phalcon/cphalcon
@@ -1233,43 +1378,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 describe --abbrev=0 --tags)
-      #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, 8.0]
     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:
-    disabled: [7.0, 7.1, 7.2] # TODO: currently segfaults (https://bugs.php.net/bug.php?id=77099)
     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:
@@ -1292,31 +1439,35 @@ extensions_available:
         && ./configure \
         && make -j$(getconf _NPROCESSORS_ONLN) \
         && make install \
+    8.0:
+      type: git
+      git_url: https://github.com/phpredis/phpredis
+      # This is a nasty work-around to fix current phpredis implementation for PHP 7.4
+      command: |
+        phpize \
+        && sed -i'' 's/ZEND_ACC_CTOR | //g' redis.c \
+        && sed -i'' 's/ZEND_ACC_DTOR | //g' redis.c \
+        && sed -i'' 's/ZEND_ACC_CTOR | //g' redis_cluster.c \
+        && ./configure \
+        && make -j$(getconf _NPROCESSORS_ONLN) \
+        && make install \
     all:
       type: pecl
   reflection:
-    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4]
+    already_avail: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0]
   rdkafka:
-    disabled: [5.2]
+    disabled: [5.2, 8.0]
     all:
       type: pecl
       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
@@ -1339,12 +1490,12 @@ 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:
+    disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.4, 8.0]
+    7.0:
       type: pecl
-      version: 5.5.0preview
+      version: 5.3.0
       build_dep: [unixodbc-dev]
       run_dep: [unixodbc]
     all:
@@ -1352,7 +1503,7 @@ extensions_available:
       build_dep: [unixodbc-dev]
       run_dep: [unixodbc]
   swoole:
-    disabled: [5.2]
+    disabled: [5.2, 8.0]
     5.3:
       type: pecl
       version: 1.9.23
@@ -1433,9 +1584,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
@@ -1457,6 +1606,10 @@ extensions_available:
       type: git
       git_url: https://github.com/php/pecl-php-uploadprogress
       configure: --enable-uploadprogress
+    8.0:
+      type: git
+      git_url: https://github.com/php/pecl-php-uploadprogress
+      configure: --enable-uploadprogress
     all:
       type: pecl
   wddx:
@@ -1465,7 +1618,7 @@ extensions_available:
       configure: --with-libxml-dir=/usr
       build_dep: [libxml2-dev]
   xdebug:
-    disabled: [7.4]
+    disabled: [7.4, 8.0]
     5.2:
       type: pecl
       version: 2.2.7
@@ -1481,34 +1634,19 @@ extensions_available:
     5.6:
       type: pecl
       version: 2.4.1
-    7.3:
-      type: pecl
-      version: 2.7.0beta1
     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/ansible/inventory

@@ -9,3 +9,4 @@ php-7.1 php_version=7.1 ansible_connection=local
 php-7.2 php_version=7.2 ansible_connection=local
 php-7.3 php_version=7.3 ansible_connection=local
 php-7.4 php_version=7.4 ansible_connection=local
+php-8.0 php_version=8.0 ansible_connection=local

build/gen-readme.sh

@@ -24,6 +24,7 @@ print_usage() {
 	echo "       gen-readme.sh 7.2"
 	echo "       gen-readme.sh 7.3"
 	echo "       gen-readme.sh 7.4"
+	echo "       gen-readme.sh 8.0"
 }
 
 
@@ -35,13 +36,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
 
@@ -75,6 +93,7 @@ if [ "${#}" -eq "0" ]; then
 	update_readme "7.2"
 	update_readme "7.3"
 	update_readme "7.4"
+	update_readme "8.0"
 elif [ "${#}" -gt "1" ]; then
 	# Specifying more than 1 argument is wrong
 	echo "Error, invalid number of arguments."
@@ -90,7 +109,8 @@ else
 	&& [ "${1}" != "7.1" ] \
 	&& [ "${1}" != "7.2" ] \
 	&& [ "${1}" != "7.3" ] \
-	&& [ "${1}" != "7.4" ]; then
+	&& [ "${1}" != "7.4" ] \
+	&& [ "${1}" != "8.0" ]; then
 		# Argument does not match any of the PHP versions
 		echo "Error, invalid argument."
 		print_usage

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

@@ -23,7 +23,7 @@ FLAVOUR="${3}"
 ### Check if PHP still starts up with working scripts
 ###
 RUN_SH_HOST="$( mktemp -d )"
-RUN_SH_CONT="/startup.d"
+RUN_SH_CONT="/startup.1.d"
 
 # Fix mount permissions
 chmod 0777 "${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}" )"