Merge pull request #222 from devilbox/release-0.130

Release 0.130
Ensure apt update works on final images
2025-12-11 19:41:16 +00:00 · 2022-01-24 18:10:29 +01:00 · 2022-01-24 16:00:26 +01:00 · 2022-01-24 00:02:29 +01:00 · 2022-01-23 22:08:10 +01:00 · 2022-01-23 19:08:31 +01:00
64 changed files with 762 additions and 468 deletions
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -40,7 +40,7 @@ jobs:
          - '8.1'
        refs:
          - 'master'
-          - '0.128'
+          - '0.130'
    steps:

      # ------------------------------------------------------------
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,42 @@
 ## Unreleased


+## Release 0.130
+
+#### Fixed
+- Fixed correct keys for `apt`
+
+#### Added
+- Added integration checks for `apt update`
+
+
+## Release 0.129
+
+#### Fixed
+- Pinned module: `uploadprogress`
+- Pinned module: `mongodb`
+- Pinned lib: `libenchant`
+- Pinned lib: `libicu`
+- Pinned lib: `libvpx`
+- Pinned PHP 8.0: https://github.com/devilbox/docker-php-fpm-8.0/pull/16
+- Pinned PHP 8.1: https://github.com/devilbox/docker-php-fpm-8.1/pull/9
+- Fixed `pgsql` apt key
+- Fixed `deployer` download on cert issues
+- Fixed `phpmd` download on cert issues
+- Fixed `phpunit` download on cert issues
+- Fixed `php-cs-fixer` download on cert issues
+- Fixed building `sockets` on PHP 8.0 and PHP 8.1
+- Fixed building `ffi` on PHP 7.4
+
+#### Changed
+- Removed `mcrypt` from PHP 8.1 as it is not yet supported
+- Removed `enchant` from PHP 7.3 and PHP 7.4 as libenchant1 is not available via apt
+- Updated PHP 8.0 base image to BullsEye: https://github.com/devilbox/docker-php-fpm-8.0/pull/17
+- Updated PHP 8.1 base image to BullsEye: https://github.com/devilbox/docker-php-fpm-8.1/pull/10
+- Updated PostgreSQL repos to Bullseye for PHP >= 7.3
+- Updated `pip` to use Python3 for PHP >= 7.3
+
+
 ## Release 0.128

 #### Added
--- a/Dockerfiles/base/Dockerfile-5.2
+++ b/Dockerfiles/base/Dockerfile-5.2
@@ -51,8 +51,8 @@ RUN set -eux \
 		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 -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-5.3
+++ b/Dockerfiles/base/Dockerfile-5.3
@@ -51,8 +51,8 @@ RUN set -eux \
 		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 -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-5.4
+++ b/Dockerfiles/base/Dockerfile-5.4
@@ -51,8 +51,8 @@ RUN set -eux \
 		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 -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-5.5
+++ b/Dockerfiles/base/Dockerfile-5.5
@@ -51,8 +51,8 @@ RUN set -eux \
 		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 -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-5.6
+++ b/Dockerfiles/base/Dockerfile-5.6
@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-7.0
+++ b/Dockerfiles/base/Dockerfile-7.0
@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-7.1
+++ b/Dockerfiles/base/Dockerfile-7.1
@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-7.2
+++ b/Dockerfiles/base/Dockerfile-7.2
@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-7.3
+++ b/Dockerfiles/base/Dockerfile-7.3
@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-7.4
+++ b/Dockerfiles/base/Dockerfile-7.4
@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-8.0
+++ b/Dockerfiles/base/Dockerfile-8.0
@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/base/Dockerfile-8.1
+++ b/Dockerfiles/base/Dockerfile-8.1
@@ -44,8 +44,8 @@ RUN set -eux \
 ### Upgrade (install ps)
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/Dockerfiles/mods/Dockerfile-5.2
+++ b/Dockerfiles/mods/Dockerfile-5.2
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:5.2-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		firebird-dev \
 		freetds-dev \
 		libbz2-dev \
@@ -459,7 +459,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install uploadprogress \
+	&& pecl install uploadprogress-1.1.4 \
 	# Enabling
 	&& docker-php-ext-enable uploadprogress \
 	&& true
@@ -571,8 +571,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	libaspell15 \
 	libc-client2007e \
 	libenchant1c2a \
--- a/Dockerfiles/mods/Dockerfile-5.3
+++ b/Dockerfiles/mods/Dockerfile-5.3
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:5.3-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
@@ -559,7 +559,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install uploadprogress \
+	&& pecl install uploadprogress-1.1.4 \
 	# Enabling
 	&& docker-php-ext-enable uploadprogress \
 	&& true
@@ -682,8 +682,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	libaio1 \
 	libaspell15 \
 	libc-client2007e \
--- a/Dockerfiles/mods/Dockerfile-5.4
+++ b/Dockerfiles/mods/Dockerfile-5.4
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:5.4-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
@@ -578,7 +578,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install uploadprogress \
+	&& pecl install uploadprogress-1.1.4 \
 	# Enabling
 	&& docker-php-ext-enable uploadprogress \
 	&& true
@@ -701,8 +701,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	libaio1 \
 	libaspell15 \
 	libc-client2007e \
--- a/Dockerfiles/mods/Dockerfile-5.5
+++ b/Dockerfiles/mods/Dockerfile-5.5
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:5.5-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
@@ -591,7 +591,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install uploadprogress \
+	&& pecl install uploadprogress-1.1.4 \
 	# Enabling
 	&& docker-php-ext-enable uploadprogress \
 	&& true
@@ -714,8 +714,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	ghostscript \
 	libaio1 \
 	libaspell15 \
--- a/Dockerfiles/mods/Dockerfile-5.6
+++ b/Dockerfiles/mods/Dockerfile-5.6
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:5.6-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
@@ -608,7 +608,7 @@ RUN set -eux \
 	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install uploadprogress \
+	&& pecl install uploadprogress-1.1.4 \
 	# Enabling
 	&& docker-php-ext-enable uploadprogress \
 	&& true
@@ -730,8 +730,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	ghostscript \
 	libaio1 \
 	libaspell15 \
--- a/Dockerfiles/mods/Dockerfile-7.0
+++ b/Dockerfiles/mods/Dockerfile-7.0
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:7.0-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		fftw-dev \
 		firebird-dev \
@@ -337,10 +337,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: mongodb --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install mongodb \
+	&& pecl install mongodb-1.9.2 \
 	# Enabling
 	&& docker-php-ext-enable mongodb \
 	&& true
@@ -495,10 +495,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: psr --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install psr \
+	&& pecl install psr-1.1.0 \
 	# Enabling
 	&& docker-php-ext-enable psr \
 	&& true
@@ -837,8 +837,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	fftw2 \
 	ghostscript \
 	gir1.2-poppler-0.18 \
--- a/Dockerfiles/mods/Dockerfile-7.1
+++ b/Dockerfiles/mods/Dockerfile-7.1
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:7.1-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		fftw-dev \
 		firebird-dev \
@@ -275,8 +275,9 @@ RUN set -eux \

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

@@ -337,10 +338,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: mongodb --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install mongodb \
+	&& pecl install mongodb-1.11.1 \
 	# Enabling
 	&& docker-php-ext-enable mongodb \
 	&& true
@@ -495,10 +496,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: psr --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install psr \
+	&& pecl install psr-1.1.0 \
 	# Enabling
 	&& docker-php-ext-enable psr \
 	&& true
@@ -847,8 +848,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	fftw2 \
 	ghostscript \
 	gir1.2-poppler-0.18 \
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:7.2-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		fftw-dev \
 		firebird-dev \
@@ -275,8 +275,9 @@ RUN set -eux \

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

@@ -498,10 +499,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: psr --------------------
 RUN set -eux \
-	# Installation: Generic
+	# Installation: Version specific
 	# Type:         PECL extension
 	# Default:      Pecl command
-	&& pecl install psr \
+	&& pecl install psr-1.1.0 \
 	# Enabling
 	&& docker-php-ext-enable psr \
 	&& true
@@ -850,8 +851,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	fftw2 \
 	ghostscript \
 	gir1.2-poppler-0.18 \
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/Dockerfiles/mods/Dockerfile-7.3
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:7.3-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		fftw-dev \
 		firebird-dev \
@@ -20,7 +20,6 @@ RUN set -eux \
 		libbz2-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
-		libenchant-dev \
 		libevent-dev \
 		libexif-dev \
 		libexpat1-dev \
@@ -173,14 +172,6 @@ RUN set -eux \
 	&& true


-# -------------------- Installing PHP Extension: enchant --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \
-	&& true
-
-
 # -------------------- Installing PHP Extension: exif --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -850,8 +841,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	fftw2 \
 	ghostscript \
 	gir1.2-poppler-0.18 \
@@ -859,7 +850,6 @@ RUN set -eux \
 	libaio1 \
 	libaspell15 \
 	libc-client2007e \
-	libenchant1c2a \
 	libexif12 \
 	libexpat1 \
 	libfbclient2 \
@@ -867,7 +857,7 @@ RUN set -eux \
 	libfreetype6 \
 	libgif7 \
 	libglib2.0-0 \
-	libicu63 \
+	libicu67 \
 	libimagequant0 \
 	libjpeg62-turbo \
 	libmagick++-6.q16-8 \
@@ -889,7 +879,7 @@ RUN set -eux \
 	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
-	libvpx5 \
+	libvpx6 \
 	libwebp-dev \
 	libwebp6 \
 	libwebpdemux2 \
@@ -967,8 +957,6 @@ RUN set -eux \
 	&& 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 '^fileinfo$' \
--- a/Dockerfiles/mods/Dockerfile-7.4
+++ b/Dockerfiles/mods/Dockerfile-7.4
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:7.4-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		fftw-dev \
 		firebird-dev \
@@ -20,7 +20,6 @@ RUN set -eux \
 		libbz2-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
-		libenchant-dev \
 		libevent-dev \
 		libexif-dev \
 		libexpat1-dev \
@@ -173,14 +172,6 @@ RUN set -eux \
 	&& true


-# -------------------- Installing PHP Extension: enchant --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         Built-in extension
-	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) enchant \
-	&& true
-
-
 # -------------------- Installing PHP Extension: exif --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -192,17 +183,8 @@ RUN set -eux \
 # -------------------- Installing PHP Extension: ffi --------------------
 RUN set -eux \
 	# Installation: Generic
-	# Type:         GIT extension
-	&& git clone https://github.com/dstogov/php-ffi /tmp/ffi \
-	&& cd /tmp/ffi \
-	# Custom:       Install command
-	&& phpize \
-&& ./configure --with-ffi \
-&& make -j$(getconf _NPROCESSORS_ONLN) \
-&& make install \
- \
-	# Enabling
-	&& docker-php-ext-enable ffi \
+	# Type:         Built-in extension
+	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) ffi \
 	&& true


@@ -845,8 +827,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	fftw2 \
 	ghostscript \
 	gir1.2-poppler-0.18 \
@@ -854,16 +836,15 @@ RUN set -eux \
 	libaio1 \
 	libaspell15 \
 	libc-client2007e \
-	libenchant1c2a \
 	libexif12 \
 	libexpat1 \
 	libfbclient2 \
-	libffi6 \
+	libffi7 \
 	libfftw3-3 \
 	libfreetype6 \
 	libgif7 \
 	libglib2.0-0 \
-	libicu63 \
+	libicu67 \
 	libimagequant0 \
 	libjpeg62-turbo \
 	libmagick++-6.q16-8 \
@@ -884,7 +865,7 @@ RUN set -eux \
 	libssh2-1 \
 	libsybdb5 \
 	libtidy5deb1 \
-	libvpx5 \
+	libvpx6 \
 	libwebp-dev \
 	libwebp6 \
 	libwebpdemux2 \
@@ -962,8 +943,6 @@ RUN set -eux \
 	&& 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$' \
--- a/Dockerfiles/mods/Dockerfile-8.0
+++ b/Dockerfiles/mods/Dockerfile-8.0
@@ -6,9 +6,9 @@ FROM devilbox/php-fpm:8.0-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		freetds-dev \
@@ -16,7 +16,7 @@ RUN set -eux \
 		libbz2-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
-		libenchant-dev \
+		libenchant-2-dev \
 		libevent-dev \
 		libfbclient2 \
 		libfreetype6-dev \
@@ -502,6 +502,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: sockets --------------------
 RUN set -eux \
+	# Version specific pre-command
+	&& docker-php-ext-configure sockets \
+&& sed -i'' 's/.*ucred.*//g' /usr/src/php/ext/sockets/sendrecvmsg.c \
+ \
 	# Installation: Generic
 	# Type:         Built-in extension
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \
@@ -688,16 +692,16 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	libaio1 \
 	libaspell15 \
 	libc-client2007e \
-	libenchant1c2a \
+	libenchant-2-2 \
 	libfbclient2 \
-	libffi6 \
+	libffi7 \
 	libfreetype6 \
-	libicu63 \
+	libicu67 \
 	libjpeg62-turbo \
 	libmcrypt4 \
 	libmemcachedutil2 \
@@ -706,7 +710,7 @@ RUN set -eux \
 	libpq5 \
 	libsybdb5 \
 	libtidy5deb1 \
-	libvpx5 \
+	libvpx6 \
 	libwebp6 \
 	libxpm4 \
 	libxslt1.1 \
--- a/Dockerfiles/mods/Dockerfile-8.1
+++ b/Dockerfiles/mods/Dockerfile-8.1
@@ -6,16 +6,16 @@ FROM devilbox/php-fpm:8.1-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		alien \
 		firebird-dev \
 		libaio-dev \
 		libbz2-dev \
 		libc-client-dev \
 		libcurl4-openssl-dev \
-		libenchant-dev \
+		libenchant-2-dev \
 		libevent-dev \
 		libfbclient2 \
 		libfreetype6-dev \
@@ -25,7 +25,6 @@ RUN set -eux \
 		libjpeg-dev \
 		libkrb5-dev \
 		libldap2-dev \
-		libmcrypt-dev \
 		libmemcached-dev \
 		libpcre3-dev \
 		libpng-dev \
@@ -196,17 +195,6 @@ RUN set -eux \
 	&& true


-# -------------------- Installing PHP Extension: mcrypt --------------------
-RUN set -eux \
-	# Installation: Generic
-	# Type:         PECL extension
-	# Default:      Pecl command
-	&& pecl install mcrypt \
-	# Enabling
-	&& docker-php-ext-enable mcrypt \
-	&& true
-
-
 # -------------------- Installing PHP Extension: msgpack --------------------
 RUN set -eux \
 	# Installation: Generic
@@ -469,6 +457,10 @@ RUN set -eux \

 # -------------------- Installing PHP Extension: sockets --------------------
 RUN set -eux \
+	# Version specific pre-command
+	&& docker-php-ext-configure sockets \
+&& sed -i'' 's/.*ucred.*//g' /usr/src/php/ext/sockets/sendrecvmsg.c \
+ \
 	# Installation: Generic
 	# Type:         Built-in extension
 	&& docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \
@@ -629,23 +621,22 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 	libaio1 \
 	libaspell15 \
 	libc-client2007e \
-	libenchant1c2a \
+	libenchant-2-2 \
 	libfbclient2 \
-	libffi6 \
+	libffi7 \
 	libfreetype6 \
-	libicu63 \
+	libicu67 \
 	libjpeg62-turbo \
-	libmcrypt4 \
 	libmemcachedutil2 \
 	libpng16-16 \
 	libpq5 \
 	libtidy5deb1 \
-	libvpx5 \
+	libvpx6 \
 	libwebp6 \
 	libxpm4 \
 	libxslt1.1 \
@@ -742,8 +733,6 @@ RUN set -eux \
 	&& 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 '^memcache$' \
--- a/Dockerfiles/prod/Dockerfile-5.2
+++ b/Dockerfiles/prod/Dockerfile-5.2
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.2-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-5.3
+++ b/Dockerfiles/prod/Dockerfile-5.3
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.3-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-5.4
+++ b/Dockerfiles/prod/Dockerfile-5.4
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.4-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-5.5
+++ b/Dockerfiles/prod/Dockerfile-5.5
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.5-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-5.6
+++ b/Dockerfiles/prod/Dockerfile-5.6
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.6-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-7.0
+++ b/Dockerfiles/prod/Dockerfile-7.0
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.0-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-7.1
+++ b/Dockerfiles/prod/Dockerfile-7.1
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.1-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-7.2
+++ b/Dockerfiles/prod/Dockerfile-7.2
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.2-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-7.3
+++ b/Dockerfiles/prod/Dockerfile-7.3
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.3-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-7.4
+++ b/Dockerfiles/prod/Dockerfile-7.4
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.4-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-8.0
+++ b/Dockerfiles/prod/Dockerfile-8.0
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.0-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/prod/Dockerfile-8.1
+++ b/Dockerfiles/prod/Dockerfile-8.1
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.1-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -45,9 +45,9 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,19 +56,19 @@ RUN set -eux \
 		\
 	&& 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" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +135,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -239,12 +239,12 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -45,9 +45,9 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,19 +56,19 @@ RUN set -eux \
 		\
 	&& 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" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +135,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -273,28 +273,28 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- php-cs-fixer --------------------
-	&& curl -sS -L --fail 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 \
+	&& curl -sS -k -L --fail https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer \
 && chmod +x /usr/local/bin/php-cs-fixer \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
 	\
 # -------------------- phpunit --------------------
-	&& curl -sS -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \
+	&& curl -sS -k -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit \
 && chmod +x /usr/local/bin/phpunit \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -45,9 +45,9 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,19 +56,19 @@ RUN set -eux \
 		\
 	&& 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" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +135,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -194,7 +194,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- drush7 --------------------
@@ -302,28 +302,28 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- php-cs-fixer --------------------
-	&& curl -sS -L --fail 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 \
+	&& curl -sS -k -L --fail https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer \
 && chmod +x /usr/local/bin/php-cs-fixer \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
 	\
 # -------------------- phpunit --------------------
-	&& curl -sS -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \
+	&& curl -sS -k -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit \
 && chmod +x /usr/local/bin/phpunit \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -45,9 +45,9 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -56,19 +56,19 @@ RUN set -eux \
 		\
 	&& 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" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
 	&& echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
-	&& curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +135,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -194,7 +194,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- drush7 --------------------
@@ -308,28 +308,28 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- php-cs-fixer --------------------
-	&& curl -sS -L --fail 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 \
+	&& curl -sS -k -L --fail https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer \
 && chmod +x /usr/local/bin/php-cs-fixer \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
 	\
 # -------------------- phpunit --------------------
-	&& curl -sS -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \
+	&& curl -sS -k -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit \
 && chmod +x /usr/local/bin/phpunit \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -45,29 +45,30 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
 		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 \
-	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
-	&& curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
-	&& curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -136,7 +137,7 @@ RUN set -eux \
 		zlib1g-dev \
 		zsh \
 		zsh-common \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -195,7 +196,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- drush7 --------------------
@@ -323,28 +324,28 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- php-cs-fixer --------------------
-	&& curl -sS -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+	&& curl -sS -k -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer \
 && chmod +x /usr/local/bin/php-cs-fixer \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
 	\
 # -------------------- phpunit --------------------
-	&& curl -sS -L --fail https://phar.phpunit.de/phpunit-5.phar > /usr/local/bin/phpunit 2>/dev/null \
+	&& curl -sS -k -L --fail https://phar.phpunit.de/phpunit-5.phar > /usr/local/bin/phpunit \
 && chmod +x /usr/local/bin/phpunit \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -45,29 +45,30 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
 		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 \
-	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
-	&& curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
-	&& curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -136,7 +137,7 @@ RUN set -eux \
 		zlib1g-dev \
 		zsh \
 		zsh-common \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -195,7 +196,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- drush7 --------------------
@@ -304,28 +305,28 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- php-cs-fixer --------------------
-	&& curl -sS -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+	&& curl -sS -k -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer \
 && chmod +x /usr/local/bin/php-cs-fixer \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
 	\
 # -------------------- phpunit --------------------
-	&& curl -sS -L --fail https://phar.phpunit.de/phpunit-6.phar > /usr/local/bin/phpunit 2>/dev/null \
+	&& curl -sS -k -L --fail https://phar.phpunit.de/phpunit-6.phar > /usr/local/bin/phpunit \
 && chmod +x /usr/local/bin/phpunit \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -45,29 +45,30 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
 		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 \
-	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
-	&& curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
-	&& curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +136,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -194,7 +195,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- drush7 --------------------
@@ -303,28 +304,28 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- php-cs-fixer --------------------
-	&& curl -sS -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+	&& curl -sS -k -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer \
 && chmod +x /usr/local/bin/php-cs-fixer \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
 	\
 # -------------------- phpunit --------------------
-	&& curl -sS -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \
+	&& curl -sS -k -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit \
 && chmod +x /usr/local/bin/phpunit \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -45,29 +45,30 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
 		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 \
-	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 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 9DA31620334BD75D9DCB49F368818C72E52529D4 \
 	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
-	&& curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +136,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -194,7 +195,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- drush7 --------------------
@@ -323,28 +324,28 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- php-cs-fixer --------------------
-	&& curl -sS -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+	&& curl -sS -k -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer \
 && chmod +x /usr/local/bin/php-cs-fixer \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
 	\
 # -------------------- phpunit --------------------
-	&& curl -sS -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \
+	&& curl -sS -k -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit \
 && chmod +x /usr/local/bin/phpunit \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -45,29 +45,30 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
 		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 \
-	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 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 9DA31620334BD75D9DCB49F368818C72E52529D4 \
 	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -L --fail 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 -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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/ bullseye-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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +136,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -158,11 +159,12 @@ RUN set -eux \
 # -------------------- pip --------------------
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libpython-dev \
+  libpython3-dev \
+  python3-distutils \
 && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
 && rm -rf /var/lib/apt/lists/* \
 \
-&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \
 \
 	\
 # -------------------- nvm --------------------
@@ -194,7 +196,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- drush7 --------------------
@@ -323,28 +325,28 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- php-cs-fixer --------------------
-	&& curl -sS -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+	&& curl -sS -k -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer \
 && chmod +x /usr/local/bin/php-cs-fixer \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
 	\
 # -------------------- phpunit --------------------
-	&& curl -sS -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \
+	&& curl -sS -k -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit \
 && chmod +x /usr/local/bin/phpunit \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -45,29 +45,30 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
 		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 \
-	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 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 9DA31620334BD75D9DCB49F368818C72E52529D4 \
 	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -L --fail 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 -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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/ bullseye-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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +136,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -158,11 +159,12 @@ RUN set -eux \
 # -------------------- pip --------------------
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libpython-dev \
+  libpython3-dev \
+  python3-distutils \
 && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
 && rm -rf /var/lib/apt/lists/* \
 \
-&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \
 \
 	\
 # -------------------- nvm --------------------
@@ -194,7 +196,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- drush7 --------------------
@@ -323,23 +325,23 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
 	\
 # -------------------- phpunit --------------------
-	&& curl -sS -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \
+	&& curl -sS -k -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit \
 && chmod +x /usr/local/bin/phpunit \
 \
 	\
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -45,29 +45,30 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
 		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 \
-	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 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 9DA31620334BD75D9DCB49F368818C72E52529D4 \
 	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -L --fail 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 -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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/ bullseye-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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +136,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -158,11 +159,12 @@ RUN set -eux \
 # -------------------- pip --------------------
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libpython-dev \
+  libpython3-dev \
+  python3-distutils \
 && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
 && rm -rf /var/lib/apt/lists/* \
 \
-&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \
 \
 	\
 # -------------------- nvm --------------------
@@ -194,7 +196,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- gitflow --------------------
@@ -251,17 +253,17 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -45,29 +45,30 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
 		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 \
-	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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 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 9DA31620334BD75D9DCB49F368818C72E52529D4 \
 	&& echo "deb http://repo.mongodb.org/apt/debian stretch/mongodb-org/4.0 main" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -L --fail 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 -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
+	&& 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/ bullseye-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 \
 	\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -135,7 +136,7 @@ RUN set -eux \
 		zip \
 		zlib1g-dev \
 		zsh \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
@@ -158,11 +159,12 @@ RUN set -eux \
 # -------------------- pip --------------------
 	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
 && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-  libpython-dev \
+  libpython3-dev \
+  python3-distutils \
 && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
 && rm -rf /var/lib/apt/lists/* \
 \
-&& curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+&& curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \
 \
 	\
 # -------------------- nvm --------------------
@@ -194,7 +196,7 @@ RUN set -eux \
 \
 	\
 # -------------------- deployer --------------------
-	&& curl -sS -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
+	&& curl -sS -k -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep \
 	&& chmod +x /usr/local/bin/dep \
 	\
 # -------------------- gitflow --------------------
@@ -251,17 +253,17 @@ RUN set -eux \
 \
 	\
 # -------------------- phpcs --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
 && chmod +x /usr/local/bin/phpcs \
 \
 	\
 # -------------------- phpcbf --------------------
-	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+	&& curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
 && chmod +x /usr/local/bin/phpcbf \
 \
 	\
 # -------------------- phpmd --------------------
-	&& curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+	&& curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
 && mv phpmd.phar /usr/local/bin/phpmd \
 && chmod +x /usr/local/bin/phpmd \
 \
--- a/README.md
+++ b/README.md
@@ -670,12 +670,12 @@ Check out this table to see which Docker image provides what PHP modules.
  <tr>
   <th>7.3</th>
   <td id="73-base">Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="73-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, vips, wddx, xdebug, xlswriter, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
+   <td id="73-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, vips, wddx, xdebug, xlswriter, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
  </tr>
  <tr>
   <th>7.4</th>
   <td id="74-base">Core, ctype, curl, date, dom, fileinfo, filter, ftp, hash, iconv, json, libxml, mbstring, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, Reflection, session, SimpleXML, sodium, SPL, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="74-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, vips, xdebug, xlswriter, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
+   <td id="74-mods">amqp, apcu, bcmath, blackfire, bz2, calendar, Core, ctype, curl, date, dba, dom, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, intl, ioncube, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pdo_sqlsrv, pgsql, phalcon, Phar, posix, pspell, psr, rdkafka, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, sqlsrv, ssh2, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, vips, xdebug, xlswriter, xml, xmlreader, xmlrpc, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
  </tr>
  <tr>
   <th>8.0</th>
@@ -685,7 +685,7 @@ Check out this table to see which Docker image provides what PHP modules.
  <tr>
   <th>8.1</th>
   <td id="81-base">Core, ctype, curl, date, dom, FFI, 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="81-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
+   <td id="81-mods">apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, exif, FFI, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, intl, json, ldap, libxml, mbstring, memcache, memcached, mongodb, msgpack, mysqli, mysqlnd, OAuth, oci8, openssl, pcntl, pcre, PDO, PDO_Firebird, pdo_mysql, PDO_OCI, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, psr, readline, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, sodium, solr, SPL, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, xdebug, xml, xmlreader, xmlwriter, xsl, yaml, Zend OPcache, zip, zlib</td>
  </tr>
 </tbody>
 </table>
--- a/build/ansible/DOCKERFILES/Dockerfile-base.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2
@@ -63,8 +63,8 @@ RUN set -eux \
 	} | tee /etc/apt/sources.list
 {% endif %}
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests procps \
 	&& rm -rf /var/lib/apt/lists/*


--- a/build/ansible/DOCKERFILES/Dockerfile-mods.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-mods.j2
@@ -31,9 +31,9 @@ FROM devilbox/php-fpm:{{ php_version }}-base as builder
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 {% for build_dep in build_deps | unique | sort %}
 		{{ build_dep }} \
 {% endfor %}
@@ -333,8 +333,8 @@ COPY --from=builder /usr/lib/oracle/ /usr/lib/oracle/
 ### Install
 ###
 RUN set -eux \
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 {# Loop over enabled run-time dependencies -#}
 {%- set run_deps = [] -%}
 {%- for ext in extensions_enabled -%}
--- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2
@@ -26,9 +26,9 @@ LABEL "org.opencontainers.image.description"="PHP-FPM {{ php_version }}-prod"
 ### Install
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		locales-all \
 		postfix \
 		postfix-pcre \
@@ -36,7 +36,7 @@ RUN set -eux \
 		rsyslog \
 		socat \
 		supervisor \
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& 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 /etc/supervisor* \
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -45,9 +45,9 @@ ENV BASH_PROFILE=".bashrc"
 ### Install Tools
 ###
 RUN set -eux \
-	&& 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 \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		apt-transport-https \
 		ca-certificates \
 		curl \
@@ -80,8 +80,8 @@ RUN set -eux \
 		{%- endif -%}
 	{%- endif -%}
 {%- endfor -%}{{ "\n\t" }}\
-	&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+	&& DEBIAN_FRONTEND=noninteractive apt-get update -q \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -q -y --no-install-recommends --no-install-suggests \
 		ack-grep \
 		aspell \
 		autoconf \
@@ -158,7 +158,7 @@ RUN set -eux \
 {% if php_version in [5.6, 7.0] %}
 		zsh-common \
 {% endif %}
-	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
+	&& DEBIAN_FRONTEND=noninteractive apt-get purge -q -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/* \
 	\
 	&& (find /usr/local/bin -type f -print0 | xargs -n1 -0 strip --strip-all -p 2>/dev/null || true) \
--- a/build/ansible/group_vars/all/mods.yml
+++ b/build/ansible/group_vars/all/mods.yml
@@ -214,13 +214,40 @@ extensions_available:
  dom:
    already_avail: "{{ php_all_versions }}"
  enchant:
+    disabled: [7.3, 7.4]
    5.2:
      type: pecl
      command: echo "/usr" | pecl install enchant
-    all:
-      type: builtin
      build_dep: [libenchant-dev]
      run_dep: [libenchant1c2a]
+    5.3:
+      build_dep: [libenchant-dev]
+      run_dep: [libenchant1c2a]
+    5.4:
+      build_dep: [libenchant-dev]
+      run_dep: [libenchant1c2a]
+    5.5:
+      build_dep: [libenchant-dev]
+      run_dep: [libenchant1c2a]
+    5.6:
+      build_dep: [libenchant-dev]
+      run_dep: [libenchant1c2a]
+    7.0:
+      build_dep: [libenchant-dev]
+      run_dep: [libenchant1c2a]
+    7.1:
+      build_dep: [libenchant-dev]
+      run_dep: [libenchant1c2a]
+    7.2:
+      build_dep: [libenchant-dev]
+      run_dep: [libenchant1c2a]
+    # https://www.php.net/manual/en/enchant.requirements.php
+    # 7.3: requires enchant 1, but not avail via apt install
+    # 7.4: requires enchant 1, but not avail via apt install
+    all:
+      type: builtin
+      build_dep: [libenchant-2-dev]
+      run_dep: [libenchant-2-2]
  exif:
    all:
      type: builtin
@@ -228,15 +255,9 @@ extensions_available:
    already_avail: [8.0, 8.1]
    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 \
+      type: builtin
      build_dep: [libffi-dev]
-      run_dep: [libffi6]
+      run_dep: [libffi7]
  fileinfo:
    already_avail: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1]
    5.2:
@@ -294,9 +315,11 @@ extensions_available:
    7.1:
      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-native-ttf
+      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx5, libfreetype6, libwebp6]
    7.2:
      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
+      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx5, libfreetype6, libwebp6]
    7.3:
      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
@@ -314,7 +337,7 @@ extensions_available:
      pre: ln -s /usr/lib/x86_64-linux-gnu/libXpm.* /usr/lib/
      configure: --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
      build_dep: [libpng-dev, libjpeg-dev, libxpm-dev, libvpx-dev, zlib1g-dev, libfreetype6-dev, libwebp-dev]
-      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx5, libfreetype6, libwebp6]
+      run_dep: [libpng16-16, libjpeg62-turbo, libxpm4, libvpx6, libfreetype6, libwebp6]
  gettext:
    all:
      type: builtin
@@ -408,10 +431,16 @@ extensions_available:
    7.0:
      type: builtin
      run_dep: [libicu57]
+    7.1:
+      type: builtin
+      run_dep: [libicu63]
+    7.2:
+      type: builtin
+      run_dep: [libicu63]
    all:
      type: builtin
      build_dep: [libicu-dev]
-      run_dep: [libicu63]
+      run_dep: [libicu67]
  ioncube:
    disabled: [8.0, 8.1]
    all:
@@ -441,7 +470,9 @@ extensions_available:
    all:
      type: builtin
  mcrypt:
-    disabled: []
+    # mcrypt 1.0.4 requires PHP 8.1.0 or older
+    # version >= 7.2.0, version <= 8.1.0, excluded versions: 8.1.0
+    disabled: [8.1]
    5.2:
      type: builtin
    5.3:
@@ -573,6 +604,12 @@ extensions_available:
    5.6:
      type: pecl
      version: 1.7.5
+    7.0:
+      type: pecl
+      version: 1.9.2
+    7.1:
+      type: pecl
+      version: 1.11.1
    all:
      type: pecl
      build_dep: [libssl-dev, libsasl2-dev]
@@ -784,6 +821,15 @@ extensions_available:
    5.6:
      type: pecl
      version: 0.6.0  # NOTE: 0.6.1 fails with: Package "psr" Version "0.6.1" does not have REST xml available
+    7.0:
+      type: pecl
+      version: 1.1.0
+    7.1:
+      type: pecl
+      version: 1.1.0
+    7.2:
+      type: pecl
+      version: 1.1.0
    all:
      type: pecl
  phalcon:
@@ -943,6 +989,16 @@ extensions_available:
      configure: --with-libxml-dir=/usr
      build_dep: [libxml2-dev]
  sockets:
+    8.0:
+      # Remove ucred (currently breaks build)
+      pre: |
+        docker-php-ext-configure sockets \
+        && sed -i'' 's/.*ucred.*//g' /usr/src/php/ext/sockets/sendrecvmsg.c \
+    8.1:
+      # Remove ucred (currently breaks build)
+      pre: |
+        docker-php-ext-configure sockets \
+        && sed -i'' 's/.*ucred.*//g' /usr/src/php/ext/sockets/sendrecvmsg.c \
    all:
      type: builtin
  sodium:
@@ -1052,14 +1108,19 @@ extensions_available:
    disabled: [8.0, 8.1]
    5.2:
      type: pecl
+      version: 1.1.4
    5.3:
      type: pecl
+      version: 1.1.4
    5.4:
      type: pecl
+      version: 1.1.4
    5.5:
      type: pecl
+      version: 1.1.4
    5.6:
      type: pecl
+      version: 1.1.4
    all:
      type: git
      git_url: https://github.com/php/pecl-php-uploadprogress
--- a/build/ansible/group_vars/all/work.yml
+++ b/build/ansible/group_vars/all/work.yml
@@ -141,11 +141,12 @@ apt_repositories_available:
      pre: echo 'Acquire::Check-Valid-Until no;' > /etc/apt/apt.conf.d/99no-check-valid-until
      deb: deb http://archive.debian.org/debian jessie-backports main
    all:
+      pre: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138
      deb: deb http://ftp.debian.org/debian stretch-backports main
  blackfire:
    all:
      deb: deb http://packages.blackfire.io/debian any main
-      pre: curl -sS -L --fail "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+      pre: curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | 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
@@ -160,6 +161,8 @@ apt_repositories_available:
    all:
      deb: deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main
      key: A1715D88E1DF1F24
+  # Get keys
+  # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
  mongo:
    5.2:
      deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
@@ -185,13 +188,25 @@ apt_repositories_available:
      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
    5.5:
      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main
-    all:
+    5.6:
      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
-      pre: curl -sS -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    7.0:
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    7.1:
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    7.2:
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main
+      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+    all:
+      deb: deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main
+      pre: curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
  yarn:
    all:
      deb: deb http://dl.yarnpkg.com/debian/ stable main
-      pre: curl -sS -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+      pre: curl -sS -k -L --fail https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -


 # -------------------------------------------------------------------------------------------------
@@ -408,7 +423,7 @@ software_available:
        && ln -sf /usr/local/bin/composer-2 /usr/local/bin/composer \
  # pip is a dependency for others
  pip:
-    all:
+    5.2:
      command: |
        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
@@ -417,6 +432,79 @@ software_available:
        && rm -rf /var/lib/apt/lists/* \
        \
        && curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+    5.3:
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libpython-dev \
+        && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+        && rm -rf /var/lib/apt/lists/* \
+        \
+        && curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+    5.4:
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libpython-dev \
+        && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+        && rm -rf /var/lib/apt/lists/* \
+        \
+        && curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+    5.5:
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libpython-dev \
+        && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+        && rm -rf /var/lib/apt/lists/* \
+        \
+        && curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+    5.6:
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libpython-dev \
+        && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+        && rm -rf /var/lib/apt/lists/* \
+        \
+        && curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+    7.0:
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libpython-dev \
+        && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+        && rm -rf /var/lib/apt/lists/* \
+        \
+        && curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+    7.1:
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libpython-dev \
+        && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+        && rm -rf /var/lib/apt/lists/* \
+        \
+        && curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+    7.2:
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libpython-dev \
+        && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+        && rm -rf /var/lib/apt/lists/* \
+        \
+        && curl -sS -L --fail https://bootstrap.pypa.io/pip/2.7/get-pip.py | python \
+    all:
+      command: |
+        DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+        && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+          libpython3-dev \
+          python3-distutils \
+        && DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+        && rm -rf /var/lib/apt/lists/* \
+        \
+        && curl -sS -L --fail https://bootstrap.pypa.io/get-pip.py | python3 \
  # nvm is a dependency for others
  nvm:
    check: su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[0-9][.0-9]+'
@@ -453,22 +541,22 @@ software_available:
    disabled: [5.2, 5.3]
    check: dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+'
    5.4:
-      command: curl -sS -L --fail https://deployer.org/releases/v3.3.0/deployer.phar -L -o /usr/local/bin/dep
+      command: curl -sS -k -L --fail 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 -L --fail https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
+      command: curl -sS -k -L --fail 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 -L --fail https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
+      command: curl -sS -k -L --fail https://deployer.org/releases/v4.3.4/deployer.phar -L -o /usr/local/bin/dep
      post: chmod +x /usr/local/bin/dep
    7.0:
-      command: curl -sS -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep
+      command: curl -sS -k -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep
      post: chmod +x /usr/local/bin/dep
    7.1:
-      command: curl -sS -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep
+      command: curl -sS -k -L --fail https://deployer.org/releases/v6.7.0/deployer.phar -L -o /usr/local/bin/dep
      post: chmod +x /usr/local/bin/dep
    all:
-      command: curl -sS -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep
+      command: curl -sS -k -L --fail https://deployer.org/deployer.phar -L -o /usr/local/bin/dep
      post: chmod +x /usr/local/bin/dep
  drush7:
    disabled: [5.2, 8.0, 8.1]
@@ -748,55 +836,55 @@ software_available:
    check: phpcs --version | grep -E 'version [0-9][.0-9]+'
    5.2:
      command: |
-        curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+        curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs \
        && chmod +x /usr/local/bin/phpcs \
    5.3:
      command: |
-        curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+        curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar > /usr/local/bin/phpcs \
        && chmod +x /usr/local/bin/phpcs \
    all:
      command: |
-        curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs 2>/dev/null \
+        curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar > /usr/local/bin/phpcs \
        && chmod +x /usr/local/bin/phpcs \
  phpcbf:
    check: phpcbf --version | grep -E 'version [0-9][.0-9]+'
    5.2:
      command: |
-        curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+        curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf \
        && chmod +x /usr/local/bin/phpcbf \
    5.3:
      command: |
-        curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+        curl -sS -L --fail https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcbf.phar > /usr/local/bin/phpcbf \
        && chmod +x /usr/local/bin/phpcbf \
    all:
      command: |
-        curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
+        curl -sS -L --fail https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf \
        && chmod +x /usr/local/bin/phpcbf \
  php-cs-fixer:
    disabled: [5.2, 7.4, 8.0, 8.1]
    check: php-cs-fixer --version 2>&1 | grep -E 'Fixer\s+(version\s*)?[-_.0-9]+\s+'
    5.3:
      command: |
-        curl -sS -L --fail 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 \
+        curl -sS -k -L --fail https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer \
        && chmod +x /usr/local/bin/php-cs-fixer \
    5.4:
      command: |
-        curl -sS -L --fail 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 \
+        curl -sS -k -L --fail https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer \
        && chmod +x /usr/local/bin/php-cs-fixer \
    5.5:
      command: |
-        curl -sS -L --fail 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 \
+        curl -sS -k -L --fail https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.2.19/php-cs-fixer.phar > /usr/local/bin/php-cs-fixer \
        && chmod +x /usr/local/bin/php-cs-fixer \
    all:
      command: |
-        curl -sS -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer 2>/dev/null \
+        curl -sS -k -L --fail https://cs.symfony.com/download/php-cs-fixer-v2.phar > /usr/local/bin/php-cs-fixer \
        && chmod +x /usr/local/bin/php-cs-fixer \
  phpmd:
    disabled: [5.2]
    check: phpmd --version | grep -E '^PHPMD [0-9][.0-9]+'
    all:
      command: |
-        curl -sS -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
+        curl -sS -k -L --fail https://phpmd.org/static/latest/phpmd.phar > phpmd.phar \
        && mv phpmd.phar /usr/local/bin/phpmd \
        && chmod +x /usr/local/bin/phpmd \
  phpunit:
@@ -804,27 +892,27 @@ software_available:
    check: phpunit --version | grep -iE '^PHPUnit\s[0-9][.0-9]+'
    5.3:
      command: |
-        curl -sS -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \
+        curl -sS -k -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit \
        && chmod +x /usr/local/bin/phpunit \
    5.4:
      command: |
-        curl -sS -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \
+        curl -sS -k -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit \
        && chmod +x /usr/local/bin/phpunit \
    5.5:
      command: |
-        curl -sS -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit 2>/dev/null \
+        curl -sS -k -L --fail https://phar.phpunit.de/phpunit-4.phar > /usr/local/bin/phpunit \
        && chmod +x /usr/local/bin/phpunit \
    5.6:
      command: |
-        curl -sS -L --fail https://phar.phpunit.de/phpunit-5.phar > /usr/local/bin/phpunit 2>/dev/null \
+        curl -sS -k -L --fail https://phar.phpunit.de/phpunit-5.phar > /usr/local/bin/phpunit \
        && chmod +x /usr/local/bin/phpunit \
    7.0:
      command: |
-        curl -sS -L --fail https://phar.phpunit.de/phpunit-6.phar > /usr/local/bin/phpunit 2>/dev/null \
+        curl -sS -k -L --fail https://phar.phpunit.de/phpunit-6.phar > /usr/local/bin/phpunit \
        && chmod +x /usr/local/bin/phpunit \
    all:
      command: |
-        curl -sS -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit 2>/dev/null \
+        curl -sS -k -L --fail https://phar.phpunit.de/phpunit-7.phar > /usr/local/bin/phpunit \
        && chmod +x /usr/local/bin/phpunit \
  symfony:
    disabled: [5.2, 5.3]
--- a/tests/base/06-test-apt-repositories.sh
+++ b/tests/base/06-test-apt-repositories.sh
@@ -0,0 +1,33 @@
+#!/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
+############################################################
+
+###
+### Ensuring 'apt update' works without any issues
+###
+did="$( docker_run "${IMAGE}:${VERSION}-${FLAVOUR}" "-e DEBUG_ENTRYPOINT=2" )"
+
+if ! docker_exec "${did}" "apt update"; then
+	docker_logs "${did}" || true
+	docker_stop "${did}" || true
+	echo "Failed"
+	exit 1
+fi
+docker_stop "${did}"
--- a/tests/mods/modules.sh
+++ b/tests/mods/modules.sh
@@ -58,22 +58,22 @@ docker run \
 		set -e
 		set -u
 		if [ -f \"\${1:-}\" ]; then
-			fail=0
-			printf \"[TEST] %s\" \"\${1}\"
+			error=0

 			if script -e -c \"php \${1}\" /dev/null 2>&1 | grep -Ei \"core|segmentation|fatal|except|err|warn|notice\" 2>&1 >/dev/null; then
-				fail=1
-			fi
-			if ! php \"\${1}\" 2>&1 | grep -E \"^(OK|SKIP)$\" 2>&1 >/dev/null; then
-				fail=1
-			fi
-
-			if [ \"\${fail}\" != \"0\" ]; then
 				printf \"\\r[FAIL] %s\\n\" \"\${1}\"
 				php \"\${1}\" || true
 				exit 1
 			else
-				printf \"\\r[OK]   %s\\n\" \"\${1}\"
+				if php \"\${1}\" 2>&1 | grep -E \"^(OK)$\" 2>&1 >/dev/null; then
+					printf \"\\r[OK]   %s\\n\" \"\${1}\"
+				elif php \"\${1}\" 2>&1 | grep -E \"^(SKIP)$\" 2>&1 >/dev/null; then
+					printf \"\\r[SKIP] %s\\n\" \"\${1}\"
+				else
+					printf \"\\r[FAIL] %s\\n\" \"\${1}\"
+					php \"\${1}\" || true
+					exit 1
+				fi
 			fi
 		fi

--- a/tests/mods/modules/enchant/enchant-aspell.php
+++ b/tests/mods/modules/enchant/enchant-aspell.php
@@ -7,6 +7,13 @@ ini_set('display_startup_errors', 1);
 ini_set('display_errors', 1);
 error_reporting(-1);

+// FIXME: Currently disabled for PHP 7.3 and PHP 7.4
+if (PHP_MAJOR_VERSION == 7) {
+	if (PHP_MINOR_VERSION == 3 || PHP_MINOR_VERSION == 4) {
+		echo 'SKIP';
+		exit(0);
+	}
+}

 $backend = 'aspell';

--- a/tests/mods/modules/enchant/enchant-hspell.php
+++ b/tests/mods/modules/enchant/enchant-hspell.php
@@ -7,6 +7,13 @@ ini_set('display_startup_errors', 1);
 ini_set('display_errors', 1);
 error_reporting(-1);

+// FIXME: Currently disabled for PHP 7.3 and PHP 7.4
+if (PHP_MAJOR_VERSION == 7) {
+	if (PHP_MINOR_VERSION == 3 || PHP_MINOR_VERSION == 4) {
+		echo 'SKIP';
+		exit(0);
+	}
+}

 $backend = 'hspell';

--- a/tests/mods/modules/enchant/enchant-hunspell.php
+++ b/tests/mods/modules/enchant/enchant-hunspell.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * This page should print 'OK' if everything works,
+ * 'FAIL' or nothing if an error occured.
+ */
+ini_set('display_startup_errors', 1);
+ini_set('display_errors', 1);
+error_reporting(-1);
+
+// FIXME: Currently disabled for PHP 7.3 and PHP 7.4
+if (PHP_MAJOR_VERSION == 7) {
+	if (PHP_MINOR_VERSION == 3 || PHP_MINOR_VERSION == 4) {
+		echo 'SKIP';
+		exit(0);
+	}
+}
+
+/**
+ * IMPORTANT:
+ * ----------
+ * The Myspell backend has been renamed to Hunspell to match the upstream
+ * project. Users with their own enchant.ordering files will need to change
+ * "myspell" to "hunspell" (as of enchant 2.0)
+ * https://github.com/AbiWord/enchant/blob/master/NEWS
+ */
+// Only available since 5.4.0
+if (version_compare(PHP_VERSION, '7.3.0', '<')) {
+	echo 'SKIP';
+	exit(0);
+}
+
+$backend = 'hunspell';
+
+$tag = 'en_US';
+if (($r = enchant_broker_init()) === FALSE) {
+	echo 'FAIL: enchant_broker_init()';
+	exit(1);
+}
+if (($bprovides = enchant_broker_describe($r)) === FALSE) {
+	echo 'FAIL: enchant_broker_describe()';
+	exit(1);
+}
+
+foreach ($bprovides as $be) {
+	if ($be['name'] == $backend) {
+		echo 'OK';
+		exit(0);
+	}
+}
+echo 'FAIL: "'. $backend . '" not available';
+exit(1);
--- a/tests/mods/modules/enchant/enchant-ispell.php
+++ b/tests/mods/modules/enchant/enchant-ispell.php
@@ -7,6 +7,22 @@ ini_set('display_startup_errors', 1);
 ini_set('display_errors', 1);
 error_reporting(-1);

+// FIXME: Currently disabled for PHP 7.3 and PHP 7.4
+if (PHP_MAJOR_VERSION == 7) {
+	if (PHP_MINOR_VERSION == 3 || PHP_MINOR_VERSION == 4) {
+		echo 'SKIP';
+		exit(0);
+	}
+}
+
+// FIXME: Currently not available for PHP 8.0 and PHP 8.1
+if (PHP_MAJOR_VERSION == 8) {
+	if (PHP_MINOR_VERSION == 0 || PHP_MINOR_VERSION == 1) {
+		echo 'SKIP';
+		exit(0);
+	}
+}
+

 $backend = 'ispell';

--- a/tests/mods/modules/enchant/enchant-myspell.php
+++ b/tests/mods/modules/enchant/enchant-myspell.php
@@ -7,6 +7,27 @@ ini_set('display_startup_errors', 1);
 ini_set('display_errors', 1);
 error_reporting(-1);

+// FIXME: Currently disabled for PHP 7.3 and PHP 7.4
+if (PHP_MAJOR_VERSION == 7) {
+	if (PHP_MINOR_VERSION == 3 || PHP_MINOR_VERSION == 4) {
+		echo 'SKIP';
+		exit(0);
+	}
+}
+
+/**
+ * IMPORTANT:
+ * ----------
+ * The Myspell backend has been renamed to Hunspell to match the upstream
+ * project. Users with their own enchant.ordering files will need to change
+ * "myspell" to "hunspell" (as of enchant 2.0)
+ * https://github.com/AbiWord/enchant/blob/master/NEWS
+ */
+// Only available since 5.4.0
+if (version_compare(PHP_VERSION, '7.3.0', '>=')) {
+	echo 'SKIP';
+	exit(0);
+}

 $backend = 'myspell';
Author	SHA1	Message	Date
cytopia	b5c34feb7c	Merge pull request #222 from devilbox/release-0.130 Release 0.130	2022-01-24 18:10:29 +01:00
cytopia	61ee6b3bfb	Ensure apt update works on final images	2022-01-24 16:00:26 +01:00
cytopia	feb6f0fee8	Merge pull request #221 from devilbox/release-0.129 Release 0.129	2022-01-24 00:02:29 +01:00
cytopia	40c3980b3e	Adjust CI tests for enchant	2022-01-23 22:08:10 +01:00
cytopia	857900acc6	Update CHANGELOG	2022-01-23 19:08:31 +01:00
cytopia	7aa26f96d0	Fix run-dep for ffi on PHP 7.4	2022-01-23 19:08:06 +01:00
cytopia	70ab96876d	Update CHANGELOG	2022-01-23 19:00:10 +01:00
cytopia	666980dc1c	Update pip to use Python3 for PHP >= 7.3	2022-01-23 18:39:51 +01:00
cytopia	b776a9110f	Update PostgreSQL repos to Bullseye for PHP >= 7.3	2022-01-23 18:33:06 +01:00
cytopia	d1ec52838a	Be a bit more verbose during apt-get commands	2022-01-23 18:19:25 +01:00
cytopia	8d8c92657a	Fixed building ffi on PHP 7.4	2022-01-23 18:12:24 +01:00
cytopia	7a2710ffc5	Fix apt package versions	2022-01-23 18:11:56 +01:00
cytopia	58751d8deb	Updated CHANGELOG	2022-01-23 16:25:31 +01:00
cytopia	3d96f15958	Updated nightly tag	2022-01-23 16:25:08 +01:00
cytopia	c8c71fb115	Removed enchant from PHP 7.3 and PHP 7.4 as libenchant1 is not available via apt	2022-01-23 16:23:30 +01:00
cytopia	e156582252	Fixed building sockets on PHP 8.0 and PHP 8.1	2022-01-23 16:18:26 +01:00
cytopia	ae9d987cb9	Fixed php-cs-fixer download on cert issues	2022-01-23 15:36:19 +01:00
cytopia	7b68744404	Do not hide curl errors during build stage	2022-01-23 14:55:12 +01:00
cytopia	c3ad81b808	Fixed phpunit download on cert issues	2022-01-23 14:50:26 +01:00
cytopia	9531a29533	Fixed phpmd download on cert issues	2022-01-23 14:40:18 +01:00
cytopia	ed3449af98	Fixed deployer.org download on cert issues	2022-01-23 14:37:25 +01:00
cytopia	5a5bcb1644	Disabled mcrypt for PHP 8.1 as not yet supported	2022-01-23 13:41:57 +01:00
cytopia	b0d72726bf	Fixed pgsql apt keys	2022-01-23 13:27:10 +01:00
cytopia	9f073247f8	Ensure versions are pinned	2022-01-23 11:42:05 +01:00