Fix postgreSQL install on PHP 7.0

Author: cytopia

CHANGELOG.md

@@ -13,7 +13,8 @@
 - FIxed installation of drupalconsole [#246](https://github.com/devilbox/docker-php-fpm/pull/246)
 - Fixed installation of symfoni cli [#247](https://github.com/devilbox/docker-php-fpm/pull/247)
 - Fixed installation of NodeJS
-- Fixed PostgreSQL client for PHP 5.6
+- Fixed installation of PostgreSQL client for PHP 5.6
+- Fixed installation of PostgreSQL client for PHP 7.0
 
 
 ## Release 0.141

Dockerfiles/work/Dockerfile-7.0

@@ -195,7 +195,7 @@ RUN set -eux \
 # -------------------- 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 \
+  && echo "deb https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/pgsql.list \
   && apt-get update; \
 fi \
  \

build/ansible/group_vars/all/work.yml

@@ -330,8 +330,7 @@ apt_repositories_available:
       deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[5.6].debian }}-pgdg main
     # [Stretch]
     7.0:
-      deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.0].debian }}-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 -
+      deb: deb https://apt-archive.postgresql.org/pub/repos/apt/ {{ os_release[7.0].debian }}-pgdg main
     # [Buster]
     7.1:
       deb: deb http://apt.postgresql.org/pub/repos/apt/ {{ os_release[7.1].debian }}-pgdg main
@@ -817,7 +816,7 @@ software_available:
       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 \
+          && 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: |