Fix install errors

2025-12-10 11:01:14 +00:00 · 2022-04-05 01:47:49 +02:00
parent e02e7781c7
commit a425b5fd82
16 changed files with 704 additions and 488 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,8 @@
 ## Release 0.139

 #### Added
- Added mongodb command line client
- Added postgresql command line client for PHP 7.1+
+- (Re-)added mongodb command line client
+- (Re-)added postgresql command line client

 ### Changed
 - Speed up `xargs` commands by using multi-CPU
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& 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 \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,20 +98,6 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -122,9 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -149,20 +130,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
-		mongofiles --version; \
-	fi \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -205,6 +173,29 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  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 \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -629,6 +620,22 @@ RUN set -eux \
 # -------------------- Software --------------------
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& git-flow version | grep -E '[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& 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 \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,20 +98,6 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -122,9 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -149,20 +130,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
-		mongofiles --version; \
-	fi \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -217,6 +185,29 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  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 \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -691,6 +682,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& drush7 --version | grep -E '7[.0-9]+\s*$' \
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& 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 \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,20 +98,6 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -122,9 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -149,20 +130,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
-		mongofiles --version; \
-	fi \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -217,6 +185,29 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  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 \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -729,6 +720,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& echo "deb http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& 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 \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -100,20 +98,6 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -122,9 +106,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -149,20 +130,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
-		mongofiles --version; \
-	fi \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -217,6 +185,29 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  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 \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -743,6 +734,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& 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" | 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 \
-	&& 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 \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -101,21 +99,6 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		mongodb-clients \
-		mongo-tools \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -124,9 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -152,18 +132,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& mongofiles --version \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -218,6 +187,30 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  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 \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients \
+    mongo-tools; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -755,6 +748,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -58,8 +58,6 @@ RUN set -eux \
 	&& 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" | 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 \
-	&& 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 \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -101,21 +99,6 @@ RUN set -eux \
 		\
 		mysql-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		mongodb-clients \
-		mongo-tools \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -124,9 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -152,18 +132,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& mongofiles --version \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -218,6 +187,30 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  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 \
+  && apt-get update; \
+fi \
+ \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    postgresql-client; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& apt-get update \
+	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  apt-get install -y --no-install-recommends --no-install-suggests \
+    mongodb-clients \
+    mongo-tools; \
+fi \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -736,6 +729,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -58,10 +58,6 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,21 +99,6 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		mongodb-org-tools \
-		mongodb-org-shell \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -126,9 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -153,18 +131,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& mongofiles --version \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -219,6 +186,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& 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/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -737,6 +725,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -58,10 +58,6 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,21 +99,6 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		mongodb-org-tools \
-		mongodb-org-shell \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -126,9 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -153,18 +131,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& mongofiles --version \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -219,6 +186,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& 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/ buster-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -757,6 +745,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -58,10 +58,6 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,21 +99,6 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		mongodb-org-tools \
-		mongodb-org-shell \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -126,9 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -153,18 +131,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& mongofiles --version \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -220,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& 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 \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -758,6 +746,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/Dockerfiles/work/Dockerfile-7.4
@@ -58,10 +58,6 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,21 +99,6 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		mongodb-org-tools \
-		mongodb-org-shell \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -126,9 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -153,18 +131,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& mongofiles --version \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -220,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& 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 \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -758,6 +746,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-8.0
+++ b/Dockerfiles/work/Dockerfile-8.0
@@ -58,10 +58,6 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,21 +99,6 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		mongodb-org-tools \
-		mongodb-org-shell \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -126,9 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -153,18 +131,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& mongofiles --version \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -220,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& 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 \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -677,6 +665,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '8.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '8.0' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-8.1
+++ b/Dockerfiles/work/Dockerfile-8.1
@@ -58,10 +58,6 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,21 +99,6 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		mongodb-org-tools \
-		mongodb-org-shell \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -126,9 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -153,18 +131,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& mongofiles --version \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -220,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& 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 \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -677,6 +665,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '8.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '8.1' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-8.2
+++ b/Dockerfiles/work/Dockerfile-8.2
@@ -58,10 +58,6 @@ RUN set -eux \
 	&& echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list \
 	&& curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
 	&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
-	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
-	&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
-	&& curl -sS -k -L --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
-	&& echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
 	\
 	&& DEBIAN_FRONTEND=noninteractive apt-get update \
 	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests \
@@ -103,21 +99,6 @@ RUN set -eux \
 		\
 		mariadb-client \
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-		mongodb-org-tools \
-		mongodb-org-shell \
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -126,9 +107,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-		postgresql-client \
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -153,18 +131,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-	&& mongofiles --version \
-	\
-# Check version: pg_isready
-	&& pg_isready --version \
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
@@ -220,6 +187,27 @@ RUN set -eux \
 && su  -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \
 \
 	\
+# -------------------- pgsql_client --------------------
+	&& 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 \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  postgresql-client \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
+# -------------------- mongo_client --------------------
+	&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+&& echo "deb http://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+&& apt-get update \
+ \
+	&& apt-get install -y --no-install-recommends --no-install-suggests \
+  mongodb-org-tools \
+  mongodb-org-shell \
+ \
+	&& rm -rf /var/lib/apt/lists/* \
+	\
 # -------------------- awesomeci --------------------
 	&& git clone https://github.com/cytopia/awesome-ci.git /usr/local/src/awesome-ci \
 && cd /usr/local/src/awesome-ci \
@@ -661,6 +649,22 @@ RUN set -eux \
 	&& composer --version 2>/dev/null | grep -Ei '(composer|version)\s*[0-9][.0-9]+' \
 	&& su  -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
 && su  -c '. /opt/nvm/nvm.sh; yarn --version' devilbox | grep -E '^v?[0-9][.0-9]+' \
+ \
+	&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+  pg_isready --version; \
+  fi \
+else \
+  pg_isready --version; \
+fi \
+ \
+	&& if echo '8.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+  if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+    mongofiles --version; \
+  fi \
+else \
+  mongofiles --version; \
+fi \
 \
 	&& regex-grep --version | grep -E '[0-9][.0-9]+' \
 	&& dep --version 2>/dev/null | grep -Ei 'deployer\s*(version\s*)?[0-9][.0-9]+' \
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -126,28 +126,6 @@ RUN set -eux \
 		mysql-client \
 {% endif %}
 		\
-# 5.2: mongodb-clients (amd64)
-# 5.3: mongodb-clients (amd64)
-# 5.4: mongodb-clients (amd64)
-# 5.5: mongodb-clients (amd64)
-# 5.6: mongodb-clients (amd64, arm64)
-# 7.0: mongodb-clients (amd64, arm64)
-# 7.1: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.2: mongo-tools OR mongodb-org-(tools|shell) (amd64, arm64)
-# 7.3: mongodb-org-(tools|shell) (amd64, arm64)
-# 7.4: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.0: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.1: mongodb-org-(tools|shell) (amd64, arm64)
-# 8.2: mongodb-org-(tools|shell) (amd64, arm64)
-{% if php_version in [5.2, 5.3, 5.4, 5.5] %}
-		$( if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then echo 'mongodb-clients'; fi ) \
-{% elif php_version in [5.6, 7.0] %}
-		mongodb-clients \
-		mongo-tools \
-{% else %}
-		mongodb-org-tools \
-		mongodb-org-shell \
-{% endif %}
 		mupdf \
 		mupdf-tools \
 		nano \
@@ -156,11 +134,6 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-		\
-{# if php_version not in [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] #}
-		postgresql-client \
-{# endif #}
-		\
 		redis-tools \
 		rsync \
 		rubygems \
@@ -188,26 +161,7 @@ RUN set -eux \
 	\
 	&& (find /usr/local/bin  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
 	&& (find /usr/local/lib  -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true) \
-	\
-# Check version: mongofiles
-{% if php_version in [5.2, 5.3, 5.4, 5.5] %}
-	&& if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
-		mongofiles --version; \
-	fi \
-{% else %}
-	&& mongofiles --version \
-{% endif %}
-	\
-# Check version: pg_isready
-{# if php_version not in [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] #}
-	&& pg_isready --version \
-{# endif #}
-	\
-# Check version: mysql
-	&& mysql --version \
-	\
-	&& true
+	&& (find /usr/local/sbin -type f -print0 | xargs -n1 -0 -P$(getconf _NPROCESSORS_ONLN) strip --strip-all -p 2>/dev/null || true)


 ###
--- a/build/ansible/group_vars/all/work.yml
+++ b/build/ansible/group_vars/all/work.yml
@@ -93,8 +93,8 @@ apt_repositories_enabled:
  - backports
  - blackfire
  #- git
-  - mongo
-  - pgsql
+  #- mongo
+  #- pgsql


 # -------------------------------------------------------------------------------------------------
@@ -156,6 +156,9 @@ software_enabled:
  - composer
  - pip
  - nvm
+  # Required for internal Devilbox connection
+  - pgsql_client
+  - mongo_client
  # Normal packages start here
  - awesomeci
  - deployer
@@ -242,7 +245,7 @@ apt_repositories_available:
      deb: deb http://packages.blackfire.io/debian any main
      pre: curl -sS -L --fail "https://packages.blackfire.io/gpg.key" | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
  ###
-  ### Git
+  ### Git (currently obsolete)
  ###
  git:
    5.2:
@@ -274,7 +277,7 @@ apt_repositories_available:
    all:
      key: A1715D88E1DF1F24
  ###
-  ### MongoDB
+  ### MongoDB (currently obsolete)
  ###
  mongo:
    # 5.2: mongodb-clients (amd64)
@@ -307,7 +310,7 @@ apt_repositories_available:
      deb: deb http://repo.mongodb.org/apt/ubuntu {{ os_release['all'].ubuntu }}/mongodb-org/4.4 multiverse
      key: 20691EEC35216C63CAF66CE1656408E390CFB1F5
  ###
-  ### PostgrSQL
+  ### PostgrSQL (currently obsolete)
  ###
  pgsql:
    # [Jessie]
@@ -703,6 +706,191 @@ software_available:
        su  -c '. {{ nvm_home }}/nvm.sh; nvm install {{ node_version }}' devilbox \
        && su  -c '. {{ nvm_home }}/nvm.sh; nvm use {{ node_version }}' devilbox \
        && su  -c '. {{ nvm_home }}/nvm.sh; corepack enable' devilbox \
+  ###
+  ### PostgrSQL Command line client
+  ###
+  # 5.2: (amd64)
+  # 5.3: (amd64)
+  # 5.4: (amd64)
+  # 5.5: (amd64)
+  # 5.6: (amd64)
+  # 7.0: (amd64)
+  # 7.1: (amd64, arm64)
+  # 7.2: (amd64, arm64)
+  # 7.3: (amd64, arm64)
+  # 7.4: (amd64, arm64)
+  # 8.0: (amd64, arm64)
+  # 8.1: (amd64, arm64)
+  # 8.2: (amd64, arm64)
+  pgsql_client:
+    check: |
+      if echo '{{ php_version }}' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0)$' >/dev/null; then \
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+        pg_isready --version; \
+        fi \
+      else \
+        pg_isready --version; \
+      fi \
+    5.2:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          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/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.3:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          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/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.4:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          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/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.5:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          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/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    5.6:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          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/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    7.0:
+      pre: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          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/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+          && apt-get update; \
+        fi \
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            postgresql-client; \
+        fi \
+    all:
+      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 - \
+        && echo "deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[php_version].debian }}-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
+        && apt-get update \
+      command: |
+        apt-get install -y --no-install-recommends --no-install-suggests \
+          postgresql-client \
+      post: rm -rf /var/lib/apt/lists/*
+  ###
+  ### MongoDB Command line client
+  ###
+  # 5.2: mongodb-clients (amd64)
+  # 5.3: mongodb-clients (amd64)
+  # 5.4: mongodb-clients (amd64)
+  # 5.5: mongodb-clients (amd64)
+  # 5.6: mongodb-clients & mongo-tools (amd64, arm64)
+  # 7.0: mongodb-clients & mongo-tools (amd64, arm64)
+  # 7.1: mongodb-org-(tools|shell) (amd64, arm64)
+  # 7.2: mongodb-org-(tools|shell) (amd64, arm64)
+  # 7.3: mongodb-org-(tools|shell) (amd64, arm64)
+  # 7.4: mongodb-org-(tools|shell) (amd64, arm64)
+  # 8.0: mongodb-org-(tools|shell) (amd64, arm64)
+  # 8.1: mongodb-org-(tools|shell) (amd64, arm64)
+  # 8.2: mongodb-org-(tools|shell) (amd64, arm64)
+  mongo_client:
+    check: |
+      if echo '{{ php_version }}' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          mongofiles --version; \
+        fi \
+      else \
+        mongofiles --version; \
+      fi \
+    5.2:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.3:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.4:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.5:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients; \
+        fi \
+    5.6:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients \
+            mongo-tools; \
+        fi \
+    7.0:
+      pre: apt-get update
+      command: |
+        if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
+          apt-get install -y --no-install-recommends --no-install-suggests \
+            mongodb-clients \
+            mongo-tools; \
+        fi \
+    all:
+      pre: |
+        APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 20691EEC35216C63CAF66CE1656408E390CFB1F5 \
+        && echo "deb http://repo.mongodb.org/apt/ubuntu {{ os_release[php_version].ubuntu }}/mongodb-org/4.4 multiverse" > /etc/apt/sources.list.d/mongo.list \
+        && apt-get update \
+      command: |
+        apt-get install -y --no-install-recommends --no-install-suggests \
+          mongodb-org-tools \
+          mongodb-org-shell \
+      post: rm -rf /var/lib/apt/lists/*
  awesomeci:
    check: regex-grep --version | grep -E '[0-9][.0-9]+'
    all: