Added postgresql command line client for PHP 7.1+

cytopia · cytopia · commit e34a8a879255 · 2022-04-03T15:55:14.000+02:00
diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
@@ -97,7 +97,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mongodb-clients \
 		mupdf \
 		mupdf-tools \
@@ -107,7 +109,8 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
@@ -97,7 +97,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mongodb-clients \
 		mupdf \
 		mupdf-tools \
@@ -107,7 +109,8 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
@@ -97,7 +97,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mongodb-clients \
 		mupdf \
 		mupdf-tools \
@@ -107,7 +109,8 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
@@ -97,7 +97,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mongodb-clients \
 		mupdf \
 		mupdf-tools \
@@ -107,7 +109,8 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
@@ -98,7 +98,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mongodb-clients \
 		mupdf \
 		mupdf-tools \
@@ -108,7 +110,8 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
@@ -98,7 +98,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mysql-client \
+		\
 		mongodb-clients \
 		mupdf \
 		mupdf-tools \
@@ -108,7 +110,8 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
@@ -98,7 +98,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mongo-tools \
 		mupdf \
 		mupdf-tools \
@@ -108,7 +110,9 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		postgresql-client \
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
@@ -98,7 +98,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mongo-tools \
 		mupdf \
 		mupdf-tools \
@@ -108,7 +110,9 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		postgresql-client \
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
@@ -100,7 +100,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -111,7 +113,9 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		postgresql-client \
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4
@@ -100,7 +100,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -111,7 +113,9 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		postgresql-client \
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0
@@ -100,7 +100,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -111,7 +113,9 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		postgresql-client \
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1
@@ -100,7 +100,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -111,7 +113,9 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		postgresql-client \
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2
@@ -100,7 +100,9 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 		mariadb-client \
+		\
 		mongodb-org-tools \
 		mongodb-org-shell \
 		mupdf \
@@ -111,7 +113,9 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+		postgresql-client \
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -119,11 +119,13 @@ RUN set -eux \
 		locales \
 		make \
 		moreutils \
+		\
 {% if php_version in [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] %}
 		mariadb-client \
 {% else %}
 		mysql-client \
 {% endif %}
+		\
 {% if php_version in [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] %}
 		mongodb-clients \
 {% elif php_version in [7.1, 7.2] %}
@@ -140,7 +142,11 @@ RUN set -eux \
 		openssh-client \
 		patch \
 		patchelf \
-#		postgresql-client \
+		\
+{% if php_version not in [5.2, 5.3, 5.4, 5.5, 5.6, 7.0] %}
+		postgresql-client \
+{% endif %}
+		\
 		redis-tools \
 		rsync \
 		rubygems \
diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml
@@ -197,20 +197,7 @@ apt_repositories_available:
   mongo:
     # 5.2 - 7.0: mongodb-clients / 7.1 - 7.2: mongo-tools / 7.3+: no mongo tools avail
     disabled: [5.2, 5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2]
-    #5.2:
-    #  # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-3.6.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
-    #  deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-    #  key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-    #5.3:
-    #  deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-    #  key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-    #5.4:
-    #  deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-    #  key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-    #5.5:
-    #  deb: deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.6 main
-    #  key: 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-    # 4.4 buster is the first one with arm64 support
+    # mongodb-org/4.4 buster is the first one with arm64 support
     all:
       # gpg --dry-run --with-fingerprint < <(curl https://www.mongodb.org/static/pgp/server-4.4.asc) | grep fingerprint | sed 's/.*=//g' | sed 's/ //g'
       deb: deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main
