Integrate new PHP-FPM images

2026-01-10 09:54:43 +00:00 · 2022-03-20 23:04:15 +01:00
parent 157945dada
commit 80f03e7512
33 changed files with 705 additions and 286 deletions
--- a/Dockerfiles/base/Dockerfile-5.4
+++ b/Dockerfiles/base/Dockerfile-5.4
@@ -1,5 +1,5 @@
 # Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
-FROM php:5.4-fpm
+FROM devilbox/php-fpm-5.4
 MAINTAINER "cytopia" <cytopia@everythingcli.org>


@@ -43,13 +43,6 @@ RUN set -eux \
 ###
 ### Upgrade (install ps)
 ###
-RUN set -eux \
-	&& rm -f /etc/apt/sources.list \
-	&& { \
-		echo "deb http://ftp.debian.org/debian jessie main"; \
-		echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
-		echo "deb http://security.debian.org/debian-security jessie/updates main"; \
-	} | tee /etc/apt/sources.list
 RUN set -eux \
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
--- a/Dockerfiles/mods/Dockerfile-5.2
+++ b/Dockerfiles/mods/Dockerfile-5.2
@@ -26,12 +26,12 @@ RUN set -eux \
 		libmagic-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
+		libmysqlclient-dev \
 		libpcre3-dev \
 		libpng-dev \
 		libpq-dev \
 		libpspell-dev \
 		librabbitmq-dev \
-		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
 		libssl-dev \
@@ -43,8 +43,28 @@ RUN set -eux \
 		libxslt-dev \
 		snmp \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -134,22 +154,14 @@ RUN set -eux \
 	&& true


-# -------------------- Installing PHP Extension: ftp --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	# Custom:       configure command
-	&& docker-php-ext-configure ftp --with-openssl-dir \
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \
-	&& true
-
-
 # -------------------- Installing PHP Extension: gd --------------------
 RUN set -eux \
 	# Version specific pre-command
 	&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \
 ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \
-ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \
+ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \
+mkdir /usr/include/freetype2/freetype && \
+ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \
 \
 	# Installation: Version specific
 	# Type:         Built-in extension
@@ -275,6 +287,26 @@ RUN set -eux \
 	&& true


+# -------------------- Installing PHP Extension: mysql --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         Built-in extension
+	# Default:      configure command
+	&& docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
+	# Installation
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
+	&& true
+
+
+# -------------------- Installing PHP Extension: mysqli --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         Built-in extension
+	# Installation
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
+	&& true
+
+
 # -------------------- Installing PHP Extension: oauth --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -323,6 +355,17 @@ RUN set -eux \
 	&& true


+# -------------------- Installing PHP Extension: pdo_mysql --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         Built-in extension
+	# Default:      configure command
+	&& docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
+	# Installation
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
+	&& true
+
+
 # -------------------- Installing PHP Extension: pdo_pgsql --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -358,14 +401,6 @@ RUN set -eux \
 	&& true


-# -------------------- Installing PHP Extension: recode --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
-	&& true
-
-
 # -------------------- Installing PHP Extension: redis --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -395,6 +430,16 @@ RUN set -eux \
 	&& true


+# -------------------- Installing PHP Extension: soap --------------------
+RUN set -eux \
+	# Installation: Generic
+	# Type:         Built-in extension
+	# Custom:       configure command
+	&& docker-php-ext-configure soap --with-libxml-dir=/usr \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
+	&& true
+
+
 # -------------------- Installing PHP Extension: sockets --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -560,22 +605,24 @@ RUN set -eux \
 	libenchant1c2a \
 	libfbclient2 \
 	libfreetype6 \
-	libicu57 \
+	libicu52 \
 	libjpeg62-turbo \
-	libmariadbclient18 \
+	libmagic1 \
 	libmcrypt4 \
 	libmemcachedutil2 \
-	libpng16-16 \
+	libmysqlclient18 \
+	libpng12-0 \
 	libpq5 \
-	librabbitmq4 \
+	librabbitmq1 \
 	librecode0 \
 	libsybdb5 \
-	libtidy5 \
-	libvpx4 \
-	libwebp6 \
+	libtidy-0.99-0 \
+	libvpx1 \
+	libwebp5 \
 	libxpm4 \
 	libxslt1.1 \
 	snmp \
+	zlib1g \
 	ca-certificates \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
--- a/Dockerfiles/mods/Dockerfile-5.3
+++ b/Dockerfiles/mods/Dockerfile-5.3
@@ -28,11 +28,13 @@ RUN set -eux \
 		libldap2-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
+		libmysqlclient-dev \
 		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
 		libpq-dev \
 		libpspell-dev \
+		librabbitmq-dev \
 		librdkafka-dev \
 		libsasl2-dev \
 		libsnmp-dev \
@@ -47,8 +49,28 @@ RUN set -eux \
 		snmp \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -65,6 +87,17 @@ RUN set -eux \
 			echo "ffi.enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-ffi.ini; \
 		fi

+# -------------------- Installing PHP Extension: amqp --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install amqp-1.9.3 \
+	# Enabling
+	&& docker-php-ext-enable amqp \
+	&& true
+
+
 # -------------------- Installing PHP Extension: apcu --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -124,20 +157,15 @@ RUN set -eux \
 	&& true


-# -------------------- Installing PHP Extension: ftp --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	# Custom:       configure command
-	&& docker-php-ext-configure ftp --with-openssl-dir \
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ftp \
-	&& true
-
-
 # -------------------- Installing PHP Extension: gd --------------------
 RUN set -eux \
 	# Version specific pre-command
-	&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \
+	&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \
+ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \
+ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \
+mkdir /usr/include/freetype2/freetype && \
+ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \
+ \
 	# Installation: Version specific
 	# Type:         Built-in extension
 	# Custom:       configure command
@@ -217,14 +245,6 @@ RUN set -eux \
 	&& true


-# -------------------- Installing PHP Extension: mbstring --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mbstring \
-	&& true
-
-
 # -------------------- Installing PHP Extension: mcrypt --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -278,10 +298,33 @@ RUN set -eux \
 	&& true


+# -------------------- Installing PHP Extension: mongodb --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         PECL extension
+	# Default:      Pecl command
+	&& pecl install mongodb-0.6.3 \
+	# Enabling
+	&& docker-php-ext-enable mongodb \
+	&& true
+
+
+# -------------------- Installing PHP Extension: mysql --------------------
+RUN set -eux \
+	# Installation: Version specific
+	# Type:         Built-in extension
+	# Default:      configure command
+	&& docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
+	# Installation
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
+	&& true
+
+
 # -------------------- Installing PHP Extension: mysqli --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
 	&& true

@@ -375,10 +418,11 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: pdo_mysql --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
-	# Custom:       configure command
+	# Default:      configure command
 	&& docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
 	&& true

@@ -671,25 +715,27 @@ RUN set -eux \
 	libenchant1c2a \
 	libfbclient2 \
 	libfreetype6 \
-	libicu57 \
+	libicu52 \
 	libjpeg62-turbo \
-	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
-	libnghttp2-14 \
-	libpng16-16 \
+	libmysqlclient18 \
+	libnghttp2-5 \
+	libpng12-0 \
 	libpq5 \
+	librabbitmq1 \
 	librdkafka1 \
 	librecode0 \
 	libsybdb5 \
-	libtidy5 \
-	libvpx4 \
-	libwebp6 \
+	libtidy-0.99-0 \
+	libvpx1 \
+	libwebp5 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
 	snmp \
 	uuid \
+	zlib1g \
 	ca-certificates \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
@@ -728,6 +774,8 @@ RUN set -eux \
 	&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
 	&& rm -f /usr/local/etc/php/php.ini \
 	\
+	&& php -m | grep -oiE '^amqp$' \
+	&& php-fpm -m | grep -oiE '^amqp$' \
 	&& php -m | grep -oiE '^apcu$' \
 	&& php-fpm -m | grep -oiE '^apcu$' \
 	&& php -m | grep -oiE '^bcmath$' \
@@ -790,6 +838,8 @@ RUN set -eux \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongo$' \
 	&& php-fpm -m | grep -oiE '^mongo$' \
+	&& php -m | grep -oiE '^mongodb$' \
+	&& php-fpm -m | grep -oiE '^mongodb$' \
 	&& php -m | grep -oiE '^mysql$' \
 	&& php-fpm -m | grep -oiE '^mysql$' \
 	&& php -m | grep -oiE '^mysqli$' \
--- a/Dockerfiles/mods/Dockerfile-5.4
+++ b/Dockerfiles/mods/Dockerfile-5.4
@@ -28,6 +28,7 @@ RUN set -eux \
 		libldap2-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
+		libmysqlclient-dev \
 		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
@@ -40,6 +41,7 @@ RUN set -eux \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
+		libwebp-dev \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -47,8 +49,28 @@ RUN set -eux \
 		snmp \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -91,7 +113,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install bcmath \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bcmath \
 	&& true


@@ -99,7 +121,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install bz2 \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
 	&& true


@@ -107,7 +129,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install calendar \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) calendar \
 	&& true


@@ -115,7 +137,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install dba \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) dba \
 	&& true


@@ -123,7 +145,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install enchant \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \
 	&& true


@@ -131,30 +153,25 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install exif \
-	&& true
-
-
-# -------------------- Installing PHP Extension: ftp --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	# Custom:       configure command
-	&& docker-php-ext-configure ftp --with-openssl-dir \
-	&& docker-php-ext-install ftp \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) exif \
 	&& true


 # -------------------- Installing PHP Extension: gd --------------------
 RUN set -eux \
 	# Version specific pre-command
-	&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \
+	&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \
+ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \
+ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \
+mkdir /usr/include/freetype2/freetype && \
+ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \
+ \
 	# Installation: Version specific
 	# Type:         Built-in extension
 	# Custom:       configure command
 	&& docker-php-ext-configure gd --with-gd --with-vpx-dir=/usr --with-jpeg-dir=/usr --with-png-dir=/usr --with-zlib-dir=/usr --with-xpm-dir=/usr --with-freetype-dir=/usr --enable-gd-native-ttf \
 	# Installation
-	&& docker-php-ext-install gd \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gd \
 	&& true


@@ -162,7 +179,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install gettext \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gettext \
 	&& true


@@ -172,7 +189,7 @@ RUN set -eux \
 	&& ln /usr/include/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/gmp.h /usr/include/ \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install gmp \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) gmp \
 	&& true


@@ -195,7 +212,7 @@ RUN set -eux \
 	# Type:         Built-in extension
 	# Custom:       configure command
 	&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \
-	&& docker-php-ext-install imap \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) imap \
 	&& true


@@ -203,7 +220,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install interbase \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) interbase \
 	&& true


@@ -212,7 +229,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         Built-in extension
 	# Installation
-	&& docker-php-ext-install intl \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) intl \
 	&& true


@@ -224,15 +241,7 @@ RUN set -eux \
 	# Type:         Built-in extension
 	# Custom:       configure command
 	&& docker-php-ext-configure ldap --with-ldap --with-ldap-sasl \
-	&& docker-php-ext-install ldap \
-	&& true
-
-
-# -------------------- Installing PHP Extension: mbstring --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	&& docker-php-ext-install mbstring \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ldap \
 	&& true


@@ -241,7 +250,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         Built-in extension
 	# Installation
-	&& docker-php-ext-install mcrypt \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mcrypt \
 	&& true


@@ -304,16 +313,19 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Version specific
 	# Type:         Built-in extension
+	# Default:      configure command
+	&& docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	# Installation
-	&& docker-php-ext-install mysql \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
 	&& true


 # -------------------- Installing PHP Extension: mysqli --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
-	&& docker-php-ext-install mysqli \
+	# Installation
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
 	&& true


@@ -357,7 +369,7 @@ https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architec
 	# Type:         Built-in extension
 	# Custom:       configure command
 	&& docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/${ORACLE_VERSION_MAJOR}/client64/lib/,${ORACLE_VERSION_MAJOR} \
-	&& docker-php-ext-install oci8 \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
 	# Generic post-command
 	&& ORACLE_HREF="$( curl -sS https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/$(dpkg-architecture --query DEB_HOST_GNU_CPU)/ | tac | tac | grep -Eo 'href="getPackage/oracle-instantclient.+basiclite.+rpm"' | tail -1 )" \
 && ORACLE_VERSION_MAJOR="$( echo "${ORACLE_HREF}" | grep -Eo 'instantclient[.0-9]+' | sed 's/instantclient//g' )" \
@@ -382,7 +394,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install pcntl \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pcntl \
 	&& true


@@ -392,7 +404,7 @@ RUN set -eux \
 	&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libsybdb.* /usr/lib/ \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install pdo_dblib \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_dblib \
 	&& true


@@ -400,17 +412,18 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install pdo_firebird \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_firebird \
 	&& true


 # -------------------- Installing PHP Extension: pdo_mysql --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
-	# Custom:       configure command
+	# Default:      configure command
 	&& docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
-	&& docker-php-ext-install pdo_mysql \
+	# Installation
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
 	&& true


@@ -418,7 +431,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install pdo_pgsql \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_pgsql \
 	&& true


@@ -426,7 +439,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install pgsql \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pgsql \
 	&& true


@@ -460,7 +473,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install pspell \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
 	&& true


@@ -490,7 +503,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install shmop \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
 	&& true


@@ -500,7 +513,7 @@ RUN set -eux \
 	# Type:         Built-in extension
 	# Custom:       configure command
 	&& docker-php-ext-configure snmp --with-openssl-dir \
-	&& docker-php-ext-install snmp \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \
 	&& true


@@ -510,7 +523,7 @@ RUN set -eux \
 	# Type:         Built-in extension
 	# Custom:       configure command
 	&& docker-php-ext-configure soap --with-libxml-dir=/usr \
-	&& docker-php-ext-install soap \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
 	&& true


@@ -518,7 +531,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install sockets \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \
 	&& true


@@ -537,7 +550,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install sysvmsg \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \
 	&& true


@@ -545,7 +558,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install sysvsem \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \
 	&& true


@@ -553,7 +566,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install sysvshm \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \
 	&& true


@@ -562,7 +575,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         Built-in extension
 	# Installation
-	&& docker-php-ext-install tidy \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) tidy \
 	&& true


@@ -594,7 +607,7 @@ RUN set -eux \
 	# Type:         Built-in extension
 	# Custom:       configure command
 	&& docker-php-ext-configure wddx --with-libxml-dir=/usr \
-	&& docker-php-ext-install wddx \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) wddx \
 	&& true


@@ -615,7 +628,7 @@ RUN set -eux \
 	# Type:         Built-in extension
 	# Custom:       configure command
 	&& docker-php-ext-configure xmlrpc --with-libxml-dir=/usr --with-iconv-dir=/usr \
-	&& docker-php-ext-install xmlrpc \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlrpc \
 	&& true


@@ -623,7 +636,7 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
-	&& docker-php-ext-install xsl \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \
 	&& true


@@ -645,7 +658,7 @@ RUN set -eux \
 	# Custom:       configure command
 	&& docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr \
 	# Installation
-	&& docker-php-ext-install zip \
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \
 	&& true


@@ -727,11 +740,13 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy-0.99-0 \
 	libvpx1 \
+	libwebp5 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
 	snmp \
 	uuid \
+	zlib1g \
 	ca-certificates \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
--- a/Dockerfiles/mods/Dockerfile-5.5
+++ b/Dockerfiles/mods/Dockerfile-5.5
@@ -30,6 +30,7 @@ RUN set -eux \
 		libmagickwand-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
+		libmysqlclient-dev \
 		libnghttp2-dev \
 		libpcre3-dev \
 		libpng-dev \
@@ -37,14 +38,12 @@ RUN set -eux \
 		libpspell-dev \
 		librabbitmq-dev \
 		librdkafka-dev \
-		librecode-dev \
 		libsasl2-dev \
 		libsnmp-dev \
 		libssl-dev \
 		libtidy-dev \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -52,8 +51,28 @@ RUN set -eux \
 		snmp \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -160,7 +179,12 @@ RUN set -eux \
 # -------------------- Installing PHP Extension: gd --------------------
 RUN set -eux \
 	# Version specific pre-command
-	&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ \
+	&& ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libjpeg.* /usr/lib/ && \
+ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libpng.* /usr/lib/ && \
+ln -s /usr/lib/$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)/libXpm.* /usr/lib/ && \
+mkdir /usr/include/freetype2/freetype && \
+ln -s /usr/include/freetype2/freetype.h /usr/include/freetype2/freetype/freetype.h \
+ \
 	# Installation: Version specific
 	# Type:         Built-in extension
 	# Custom:       configure command
@@ -330,6 +354,8 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Version specific
 	# Type:         Built-in extension
+	# Default:      configure command
+	&& docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
 	&& true
@@ -337,8 +363,9 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: mysqli --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysqli \
 	&& true

@@ -429,10 +456,11 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: pdo_mysql --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         Built-in extension
-	# Custom:       configure command
+	# Default:      configure command
 	&& docker-php-ext-configure pdo_mysql --with-zlib-dir=/usr \
+	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pdo_mysql \
 	&& true

@@ -487,14 +515,6 @@ RUN set -eux \
 	&& true


-# -------------------- Installing PHP Extension: recode --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
-	&& true
-
-
 # -------------------- Installing PHP Extension: redis --------------------
 RUN set -eux \
 	# Installation: Version specific
@@ -745,28 +765,28 @@ RUN set -eux \
 	libenchant1c2a \
 	libfbclient2 \
 	libfreetype6 \
-	libicu57 \
+	libicu52 \
 	libjpeg62-turbo \
-	libmagickwand-6.q16-6 \
-	libmariadbclient18 \
+	libmagickwand-6.q16-2 \
 	libmcrypt4 \
 	libmemcachedutil2 \
+	libmysqlclient18 \
 	libnghttp2-14 \
-	libpng16-16 \
+	libpng12-0 \
 	libpq5 \
-	librabbitmq4 \
+	librabbitmq1 \
 	librdkafka1 \
 	librecode0 \
 	libsybdb5 \
-	libtidy5 \
-	libvpx4 \
-	libwebp-dev \
-	libwebp6 \
+	libtidy-0.99-0 \
+	libvpx1 \
+	libwebp5 \
 	libxpm4 \
 	libxslt1.1 \
 	libyaml-0-2 \
 	snmp \
 	uuid \
+	zlib1g \
 	ca-certificates \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
--- a/Dockerfiles/mods/Dockerfile-5.6
+++ b/Dockerfiles/mods/Dockerfile-5.6
@@ -28,6 +28,7 @@ RUN set -eux \
 		libkrb5-dev \
 		libldap2-dev \
 		libmagickwand-dev \
+		libmariadbclient-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
@@ -44,7 +45,6 @@ RUN set -eux \
 		libtidy-dev \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -53,8 +53,28 @@ RUN set -eux \
 		snmp \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -345,6 +365,8 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Generic
 	# Type:         Built-in extension
+	# Custom:       configure command
+	&& docker-php-ext-configure mysql --with-mysql --with-mysql-sock --with-zlib-dir=/usr --with-libdir="/lib/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)" \
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) mysql \
 	&& true

--- a/Dockerfiles/mods/Dockerfile-7.0
+++ b/Dockerfiles/mods/Dockerfile-7.0
@@ -38,6 +38,7 @@ RUN set -eux \
 		libmagick++-dev \
 		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
+		libmariadbclient-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
@@ -58,7 +59,6 @@ RUN set -eux \
 		libtool \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libwebpdemux2 \
 		libwebpmux2 \
 		libxml2-dev \
@@ -70,8 +70,28 @@ RUN set -eux \
 		unixodbc-dev \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -885,6 +905,7 @@ RUN set -eux \
 	libmagickcore-6.q16-3-extra \
 	libmagickwand-6.q16-3 \
 	libmagickwand-6.q16hdri-3 \
+	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
--- a/Dockerfiles/mods/Dockerfile-7.1
+++ b/Dockerfiles/mods/Dockerfile-7.1
@@ -39,6 +39,7 @@ RUN set -eux \
 		libmagick++-dev \
 		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
+		libmariadbclient-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
@@ -59,7 +60,6 @@ RUN set -eux \
 		libtool \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libwebpdemux2 \
 		libwebpmux3 \
 		libxml2-dev \
@@ -71,8 +71,28 @@ RUN set -eux \
 		unixodbc-dev \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -897,6 +917,7 @@ RUN set -eux \
 	libmagickcore-6.q16-6-extra \
 	libmagickwand-6.q16-6 \
 	libmagickwand-6.q16hdri-6 \
+	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
@@ -911,7 +932,6 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
-	libwebp-dev \
 	libwebp6 \
 	libwebpdemux2 \
 	libwebpmux3 \
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -39,6 +39,7 @@ RUN set -eux \
 		libmagick++-dev \
 		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
+		libmariadbclient-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
@@ -59,7 +60,6 @@ RUN set -eux \
 		libtool \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libwebpdemux2 \
 		libwebpmux3 \
 		libxml2-dev \
@@ -71,8 +71,28 @@ RUN set -eux \
 		unixodbc-dev \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -900,6 +920,7 @@ RUN set -eux \
 	libmagickcore-6.q16-6-extra \
 	libmagickwand-6.q16-6 \
 	libmagickwand-6.q16hdri-6 \
+	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
@@ -914,7 +935,6 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx5 \
-	libwebp-dev \
 	libwebp6 \
 	libwebpdemux2 \
 	libwebpmux3 \
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/Dockerfiles/mods/Dockerfile-7.3
@@ -38,6 +38,7 @@ RUN set -eux \
 		libmagick++-dev \
 		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
+		libmariadbclient-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
@@ -58,7 +59,6 @@ RUN set -eux \
 		libtool \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libwebpdemux2 \
 		libwebpmux3 \
 		libxml2-dev \
@@ -70,8 +70,28 @@ RUN set -eux \
 		unixodbc-dev \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -889,6 +909,7 @@ RUN set -eux \
 	libmagickcore-6.q16-6-extra \
 	libmagickwand-6.q16-6 \
 	libmagickwand-6.q16hdri-6 \
+	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
@@ -903,7 +924,6 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx6 \
-	libwebp-dev \
 	libwebp6 \
 	libwebpdemux2 \
 	libwebpmux3 \
--- a/Dockerfiles/mods/Dockerfile-7.4
+++ b/Dockerfiles/mods/Dockerfile-7.4
@@ -39,6 +39,7 @@ RUN set -eux \
 		libmagick++-dev \
 		libmagickcore-6.q16-dev \
 		libmagickwand-dev \
+		libmariadbclient-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
@@ -58,7 +59,6 @@ RUN set -eux \
 		libtool \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libwebpdemux2 \
 		libwebpmux3 \
 		libxml2-dev \
@@ -70,8 +70,28 @@ RUN set -eux \
 		unixodbc-dev \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -591,6 +611,8 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Version specific
 	# Type:         Built-in extension
+	# Default:      configure command
+	&& docker-php-ext-configure snmp --with-openssl-dir \
 	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) snmp \
 	&& true
@@ -600,6 +622,8 @@ RUN set -eux \
 RUN set -eux \
 	# Installation: Version specific
 	# Type:         Built-in extension
+	# Default:      configure command
+	&& docker-php-ext-configure soap --with-libxml-dir=/usr \
 	# Installation
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
 	&& true
@@ -876,6 +900,7 @@ RUN set -eux \
 	libmagickcore-6.q16-6-extra \
 	libmagickwand-6.q16-6 \
 	libmagickwand-6.q16hdri-6 \
+	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
@@ -889,7 +914,6 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx6 \
-	libwebp-dev \
 	libwebp6 \
 	libwebpdemux2 \
 	libwebpmux3 \
--- a/Dockerfiles/mods/Dockerfile-8.0
+++ b/Dockerfiles/mods/Dockerfile-8.0
@@ -28,6 +28,7 @@ RUN set -eux \
 		libkrb5-dev \
 		libldap2-dev \
 		libmagickwand-dev \
+		libmariadbclient-dev \
 		libmcrypt-dev \
 		libmemcached-dev \
 		libnghttp2-dev \
@@ -44,7 +45,6 @@ RUN set -eux \
 		libtidy-dev \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -54,8 +54,28 @@ RUN set -eux \
 		unixodbc-dev \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -793,6 +813,7 @@ RUN set -eux \
 	libicu67 \
 	libjpeg62-turbo \
 	libmagickwand-6.q16-6 \
+	libmariadbclient18 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libnghttp2-14 \
@@ -803,7 +824,6 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx6 \
-	libwebp-dev \
 	libwebp6 \
 	libxpm4 \
 	libxslt1.1 \
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -29,6 +29,7 @@ RUN set -eux \
 		libkrb5-dev \
 		libldap2-dev \
 		libmagickwand-dev \
+		libmariadbclient-dev \
 		libmemcached-dev \
 		libpcre3-dev \
 		libpng-dev \
@@ -43,7 +44,6 @@ RUN set -eux \
 		libtidy-dev \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -53,8 +53,28 @@ RUN set -eux \
 		unixodbc-dev \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -769,6 +789,7 @@ RUN set -eux \
 	libicu67 \
 	libjpeg62-turbo \
 	libmagickwand-6.q16-6 \
+	libmariadbclient18 \
 	libmemcachedutil2 \
 	libpng16-16 \
 	libpq5 \
@@ -777,7 +798,6 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx6 \
-	libwebp-dev \
 	libwebp6 \
 	libxpm4 \
 	libxslt1.1 \
--- a/Dockerfiles/mods/Dockerfile-8.2
+++ b/Dockerfiles/mods/Dockerfile-8.2
@@ -29,6 +29,7 @@ RUN set -eux \
 		libkrb5-dev \
 		libldap2-dev \
 		libmagickwand-dev \
+		libmariadbclient-dev \
 		libmemcached-dev \
 		libpcre3-dev \
 		libpng-dev \
@@ -43,7 +44,6 @@ RUN set -eux \
 		libtidy-dev \
 		libvpx-dev \
 		libwebp-dev \
-		libwebp6 \
 		libxml2-dev \
 		libxpm-dev \
 		libxslt-dev \
@@ -53,8 +53,28 @@ RUN set -eux \
 		unixodbc-dev \
 		uuid-dev \
 		zlib1g-dev \
+# Build tools
+		autoconf \
+		bison \
+		bisonc++ \
 		ca-certificates \
-		git
+		curl \
+		dpkg-dev \
+		file \
+		flex \
+		g++ \
+		gcc \
+		git \
+		lemon \
+		libc-client-dev \
+		libc-dev \
+		libcurl4-openssl-dev \
+		libssl-dev \
+		make \
+		patch \
+		pkg-config \
+		re2c \
+		xz-utils


 # Fix timezone (only required for testing to stop php -v and php-fpm -v from complaining to stderr)
@@ -758,6 +778,7 @@ RUN set -eux \
 	libicu67 \
 	libjpeg62-turbo \
 	libmagickwand-6.q16-6 \
+	libmariadbclient18 \
 	libmemcachedutil2 \
 	libpng16-16 \
 	libpq5 \
@@ -766,7 +787,6 @@ RUN set -eux \
 	libsybdb5 \
 	libtidy5deb1 \
 	libvpx6 \
-	libwebp-dev \
 	libwebp6 \
 	libxpm4 \
 	libxslt1.1 \
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -55,16 +55,16 @@ RUN set -eux \
 		dirmngr \
 		gnupg \
 		\
-	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
+	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | 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 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.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 -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | 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 \
+	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | 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 \
 	\
@@ -79,7 +79,6 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
-		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \
@@ -155,7 +154,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
@@ -264,10 +263,10 @@ RUN set -eux \
 \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& VERSION="$( curl -sSL -L --fail 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 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
 && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
 && dpkg -i /tmp/wkhtmltopdf.deb \
 && rm -f /tmp/wkhtmltopdf.deb \
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -55,16 +55,16 @@ RUN set -eux \
 		dirmngr \
 		gnupg \
 		\
-	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
+	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | 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 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.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 -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | 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 \
+	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | 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 \
 	\
@@ -79,7 +79,6 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
-		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \
@@ -155,7 +154,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
@@ -314,10 +313,10 @@ RUN set -eux \
 \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& VERSION="$( curl -sSL -L --fail 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 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
 && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
 && dpkg -i /tmp/wkhtmltopdf.deb \
 && rm -f /tmp/wkhtmltopdf.deb \
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -154,7 +154,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -55,16 +55,16 @@ RUN set -eux \
 		dirmngr \
 		gnupg \
 		\
-	&& apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
-	&& echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list \
+	&& echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until \
+	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | 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 9DA31620334BD75D9DCB49F368818C72E52529D4 \
-	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.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 -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | 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 \
+	&& echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	&& curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | 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 \
 	\
@@ -79,7 +79,6 @@ RUN set -eux \
 		blackfire-agent \
 		build-essential \
 		bzip2 \
-		certbot \
 		coreutils \
 		dnsutils \
 		dos2unix \
@@ -155,7 +154,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
@@ -354,10 +353,10 @@ RUN set -eux \
 	&& chmod +x /usr/local/bin/symfony \
 	\
 # -------------------- wkhtmltopdf --------------------
-	&& VERSION="$( curl -sSL -L --fail https://github.com/wkhtmltopdf/wkhtmltopdf/releases | grep -Eo '/wkhtmltopdf/.+stretch_amd64\.deb' | head -1 )" \
+	&& VERSION="$( curl -sSL -L --fail 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 libxfont2 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
+  libfontenc1 libxfont1 xfonts-75dpi xfonts-base xfonts-encodings xfonts-utils \
 && curl -sS -L --fail -o /tmp/wkhtmltopdf.deb  https://github.com/${VERSION} \
 && dpkg -i /tmp/wkhtmltopdf.deb \
 && rm -f /tmp/wkhtmltopdf.deb \
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -156,7 +156,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -156,7 +156,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -155,7 +155,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -155,7 +155,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -155,7 +155,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -155,7 +155,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -155,7 +155,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -155,7 +155,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###
--- a/Dockerfiles/work/Dockerfile-8.2
+++ b/Dockerfiles/work/Dockerfile-8.2
@@ -155,7 +155,7 @@ RUN set -eux \
 			mongodb-org-tools; \
 	fi \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
-	&& rm -rf /var/lib/apt/lists/* \
+	&& rm -rf /var/lib/apt/lists/*


 ###