From 8a018bb86d01cc9267b9fddd62242c49bbd5213b Mon Sep 17 00:00:00 2001
From: Marcus Bergner <mbe@vizrt.com>
Date: Tue, 21 Jul 2020 12:13:22 +0200
Subject: [PATCH 1/2] Use apt-archive.postgresql.org debs and fix dpkg
 dependency problems

See also: https://github.com/paunin/PostDock/issues/260

http://apt-archive.postgresql.org/pub/repos/apt/pool/main is now used
instead of http://atalia.postgresql.org/morgue when referencing old
Debian packages.

URI escaping of + to %2B in apt-archive urls to ensure wget download
works as expected from apt-archive.

Fixed dpkg dependency problems for pgpool and libpgpool0 by apt-get
install-ing the following packages:
postgresql-common

Fixed dpkg dependency problems for barman by apt-get install-ing the
following packages:
python-argcomplete python-argh python-dateutil python-psycopg2 rsync

Fixed dpkg dependency problem for pgpool by ensuring libmemcached11 is
installed for pgpool 3.6 and 3.7, but pgpool 3.3 gets libmemcached10.
---
 make/barman/make.sh                               |  4 ++--
 make/pgpool/make.sh                               | 10 +++++-----
 make/postgres/make.sh                             | 14 +++++++-------
 .../dockerfile/Barman-2.3-2.4.part.Dockerfile     |  6 +++---
 .../dockerfile/Pgpool-3.3-3.7.part.Dockerfile     | 15 ++++++++++-----
 ...Postgres-9.5-11-Repmgr-3.2-4.0.part.Dockerfile |  4 ++--
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/make/barman/make.sh b/make/barman/make.sh
index d45379c8..5fed4006 100644
--- a/make/barman/make.sh
+++ b/make/barman/make.sh
@@ -1,7 +1,7 @@
 echo ">>> Making barman"
 
-for VALS in "BARMAN_VERSION=2.3 BARMAN_PACKAGE_VERSION=2.3-2.pgdg90+1"\
-            "BARMAN_VERSION=2.4 BARMAN_PACKAGE_VERSION=2.4-1.pgdg90+1"; do
+for VALS in "BARMAN_VERSION=2.3 BARMAN_PACKAGE_VERSION=2.3-2.pgdg%2B1"\
+            "BARMAN_VERSION=2.4 BARMAN_PACKAGE_VERSION=2.4-1.pgdg%2B1"; do
     eval $VALS
 
     for PG_CLIENT_VERSION in 9.6 10 11; do
diff --git a/make/pgpool/make.sh b/make/pgpool/make.sh
index ef417f1c..87d960b1 100644
--- a/make/pgpool/make.sh
+++ b/make/pgpool/make.sh
@@ -1,17 +1,17 @@
 echo ">>> Making pgpool"
 
-for VALS in "PGPOOL_VERSION=3.3 PGPOOL_PACKAGE_VERSION=3.3.4-1.pgdg70+1" \
-            "PGPOOL_VERSION=3.6 PGPOOL_PACKAGE_VERSION=3.6.7-1.pgdg90+1" \
-            "PGPOOL_VERSION=3.7 PGPOOL_PACKAGE_VERSION=3.7.5-2.pgdg90+1";  do
+for VALS in "PGPOOL_VERSION=3.3 PGPOOL_PACKAGE_VERSION=3.3.4-1.pgdg70%2B1" \
+            "PGPOOL_VERSION=3.6 PGPOOL_PACKAGE_VERSION=3.6.7-1.pgdg%2B1 LIBMEMCACHED11=1" \
+            "PGPOOL_VERSION=3.7 PGPOOL_PACKAGE_VERSION=3.7.5-2.pgdg%2B1 LIBMEMCACHED11=1";  do
     eval $VALS
 
     for PG_CLIENT_VERSION in 9.6 10 11; do
-        VALS="$VALS PG_CLIENT_VERSION=$PG_CLIENT_VERSION PG_CLIENT_LATEST=1"
+        TEMPLATE_VALS="$VALS PG_CLIENT_VERSION=$PG_CLIENT_VERSION PG_CLIENT_LATEST=1"
 
         FILE_FROM="./src/includes/dockerfile/Pgpool-$PGPOOL_VERSION.part.Dockerfile"
         FILE_TO="./src/Pgpool-$PGPOOL_VERSION-Postgres-$PG_CLIENT_VERSION.Dockerfile"
 
-        template $FILE_FROM $FILE_TO $VALS
+        template $FILE_FROM $FILE_TO $TEMPLATE_VALS
     done
 done
 unset PGPOOL_VERSION PGPOOL_PACKAGE_VERSION VALS
diff --git a/make/postgres/make.sh b/make/postgres/make.sh
index e716dec6..45df4e09 100644
--- a/make/postgres/make.sh
+++ b/make/postgres/make.sh
@@ -1,13 +1,13 @@
 echo ">>> Making postgres"
 
 
-for VALS in "POSTGRES_VERSION=9.5 REPMGR_VERSION=3.2 REPMGR_SYNTAX_V3=1 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80+1" \
-            "POSTGRES_VERSION=9.6 REPMGR_VERSION=3.2 REPMGR_SYNTAX_V3=1 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80+1" \
-            "POSTGRES_VERSION=10 REPMGR_VERSION=3.2 REPMGR_SYNTAX_V3=1 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80+1" \
-            "POSTGRES_VERSION=9.5 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg80+1" \
-            "POSTGRES_VERSION=9.6 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg80+1" \
-            "POSTGRES_VERSION=10 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg+1" \
-            "POSTGRES_VERSION=11 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg+1"; do
+for VALS in "POSTGRES_VERSION=9.5 REPMGR_VERSION=3.2 REPMGR_SYNTAX_V3=1 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80%2B1" \
+            "POSTGRES_VERSION=9.6 REPMGR_VERSION=3.2 REPMGR_SYNTAX_V3=1 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80%2B1" \
+            "POSTGRES_VERSION=10 REPMGR_VERSION=3.2 REPMGR_SYNTAX_V3=1 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80%2B1" \
+            "POSTGRES_VERSION=9.5 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg80%2B1" \
+            "POSTGRES_VERSION=9.6 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg80%2B1" \
+            "POSTGRES_VERSION=10 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg%2B1" \
+            "POSTGRES_VERSION=11 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg%2B1"; do
     eval $VALS
     FILE_FROM="./src/includes/dockerfile/Postgres-$POSTGRES_VERSION-Repmgr-$REPMGR_VERSION.part.Dockerfile"
     FILE_FROM_EXT="./src/includes/dockerfile/Postgres-extended-$POSTGRES_VERSION-Repmgr-$REPMGR_VERSION.part.Dockerfile"
diff --git a/src/includes/dockerfile/Barman-2.3-2.4.part.Dockerfile b/src/includes/dockerfile/Barman-2.3-2.4.part.Dockerfile
index 47179956..b9e2e274 100644
--- a/src/includes/dockerfile/Barman-2.3-2.4.part.Dockerfile
+++ b/src/includes/dockerfile/Barman-2.3-2.4.part.Dockerfile
@@ -12,18 +12,18 @@ RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/fun
 RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update && \
-     apt-get install -y libffi-dev libssl-dev openssh-server
+     apt-get install -y libffi-dev libssl-dev openssh-server python-argcomplete python-argh python-dateutil python-psycopg2 rsync
 
 {{ #PG_CLIENT_LATEST }}
 RUN  apt-get install -y postgresql-client-{{ PG_CLIENT_VERSION }}
 {{ /PG_CLIENT_LATEST }}{{ ^PG_CLIENT_LATEST }}
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/postgresql-{{ PG_CLIENT_VERSION }}/postgresql-client-{{ PG_CLIENT_VERSION }}_{{ PG_CLIENT_PACKAGE_VERSION }}_amd64.deb"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/postgresql-{{ PG_CLIENT_VERSION }}/postgresql-client-{{ PG_CLIENT_VERSION }}_{{ PG_CLIENT_PACKAGE_VERSION }}_amd64.deb"
 {{ /PG_CLIENT_LATEST }}
 
 {{ #BARMAN_LATEST }}
 RUN  apt-get install -y barman={{ BARMAN_VERSION }}\*
 {{ /BARMAN_LATEST }}{{ ^BARMAN_LATEST }}
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/b/barman/barman_{{ BARMAN_PACKAGE_VERSION }}_all.deb"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/b/barman/barman_{{ BARMAN_PACKAGE_VERSION }}_all.deb"
 {{ /BARMAN_LATEST }}
 
 RUN apt-get -y install cron
diff --git a/src/includes/dockerfile/Pgpool-3.3-3.7.part.Dockerfile b/src/includes/dockerfile/Pgpool-3.3-3.7.part.Dockerfile
index da06ce34..29caff2e 100644
--- a/src/includes/dockerfile/Pgpool-3.3-3.7.part.Dockerfile
+++ b/src/includes/dockerfile/Pgpool-3.3-3.7.part.Dockerfile
@@ -17,18 +17,23 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      apt-get update
 
 {{ #PG_CLIENT_LATEST }}
-RUN  apt-get install -y postgresql-client-{{ PG_CLIENT_VERSION }}
+RUN  apt-get install -y postgresql-client-{{ PG_CLIENT_VERSION }} postgresql-common
 {{ /PG_CLIENT_LATEST }}{{ ^PG_CLIENT_LATEST }}
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/postgresql-{{ PG_CLIENT_VERSION }}/postgresql-client-{{ PG_CLIENT_VERSION }}_{{ PG_CLIENT_PACKAGE_VERSION }}_amd64.deb" "postgresql-client-{{ PG_CLIENT_VERSION }}"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/postgresql-{{ PG_CLIENT_VERSION }}/postgresql-client-{{ PG_CLIENT_VERSION }}_{{ PG_CLIENT_PACKAGE_VERSION }}_amd64.deb" "postgresql-client-{{ PG_CLIENT_VERSION }}" postgresql-common
 {{ /PG_CLIENT_LATEST }}
 
+{{ #LIBMEMCACHED11 }}
+RUN apt-get install -y libmemcached11
+{{ /LIBMEMCACHED11 }}{{ ^LIBMEMCACHED11 }}
+RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
+{{ /LIBMEMCACHED11 }}
+
 {{ #PGPOOL_LATEST }}
 RUN  apt-get install -y libpgpool0={{ PGPOOL_VERSION }}\* pgpool2={{ PGPOOL_VERSION }}\*
 {{ /PGPOOL_LATEST }}{{ ^PGPOOL_LATEST }}
-RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_{{ PGPOOL_PACKAGE_VERSION }}_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_{{ PGPOOL_PACKAGE_VERSION }}_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_{{ PGPOOL_PACKAGE_VERSION }}_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_{{ PGPOOL_PACKAGE_VERSION }}_amd64.deb" "pgpool2"
 {{ /PGPOOL_LATEST }}
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
diff --git a/src/includes/dockerfile/Postgres-9.5-11-Repmgr-3.2-4.0.part.Dockerfile b/src/includes/dockerfile/Postgres-9.5-11-Repmgr-3.2-4.0.part.Dockerfile
index f888c25d..6d783935 100644
--- a/src/includes/dockerfile/Postgres-9.5-11-Repmgr-3.2-4.0.part.Dockerfile
+++ b/src/includes/dockerfile/Postgres-9.5-11-Repmgr-3.2-4.0.part.Dockerfile
@@ -9,8 +9,8 @@ RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/fun
 {{ #REPMGR_LATEST }}
 RUN apt-get install -y postgresql-$PG_MAJOR-repmgr={{ REPMGR_PACKAGE_VERSION }}\*
 {{ /REPMGR_LATEST }}{{ ^REPMGR_LATEST }}
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_{{ REPMGR_PACKAGE_VERSION }}_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_{{ REPMGR_PACKAGE_VERSION }}_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_{{ REPMGR_PACKAGE_VERSION }}_all.deb"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_{{ REPMGR_PACKAGE_VERSION }}_amd64.deb"
 {{ /REPMGR_LATEST }}
 
 # Inherited variables

From 95584c38f2d37785c749abd62ecee790db11d676 Mon Sep 17 00:00:00 2001
From: Marcus Bergner <mbe@vizrt.com>
Date: Tue, 21 Jul 2020 12:26:45 +0200
Subject: [PATCH 2/2] Update generated Dockerfiles based on latest fixes

Besides building the generated files I also ran docker-compose build on
all variants, similar to this and all of them were ok.

    make/make.sh
    cd docker-compose
    for f in *.yml
    do
        echo "$f"
        docker-compose -f $f build > /tmp/$f.log 2>&1
        egrep "dpkg.*error" /tmp/$f.log
        tail -n1 /tmp/$f.log
    done
---
 src/Barman-2.3-Postgres-10.Dockerfile           | 4 ++--
 src/Barman-2.3-Postgres-11.Dockerfile           | 4 ++--
 src/Barman-2.3-Postgres-9.6.Dockerfile          | 4 ++--
 src/Barman-2.4-Postgres-10.Dockerfile           | 4 ++--
 src/Barman-2.4-Postgres-11.Dockerfile           | 4 ++--
 src/Barman-2.4-Postgres-9.6.Dockerfile          | 4 ++--
 src/Pgpool-3.3-Postgres-10.Dockerfile           | 8 +++++---
 src/Pgpool-3.3-Postgres-11.Dockerfile           | 8 +++++---
 src/Pgpool-3.3-Postgres-9.6.Dockerfile          | 8 +++++---
 src/Pgpool-3.6-Postgres-10.Dockerfile           | 9 +++++----
 src/Pgpool-3.6-Postgres-11.Dockerfile           | 9 +++++----
 src/Pgpool-3.6-Postgres-9.6.Dockerfile          | 9 +++++----
 src/Pgpool-3.7-Postgres-10.Dockerfile           | 9 +++++----
 src/Pgpool-3.7-Postgres-11.Dockerfile           | 9 +++++----
 src/Pgpool-3.7-Postgres-9.6.Dockerfile          | 9 +++++----
 src/Postgres-10-Repmgr-3.2.Dockerfile           | 4 ++--
 src/Postgres-10-Repmgr-4.0.Dockerfile           | 4 ++--
 src/Postgres-11-Repmgr-4.0.Dockerfile           | 4 ++--
 src/Postgres-9.5-Repmgr-3.2.Dockerfile          | 4 ++--
 src/Postgres-9.5-Repmgr-4.0.Dockerfile          | 4 ++--
 src/Postgres-9.6-Repmgr-3.2.Dockerfile          | 4 ++--
 src/Postgres-9.6-Repmgr-4.0.Dockerfile          | 4 ++--
 src/Postgres-extended-10-Repmgr-3.2.Dockerfile  | 4 ++--
 src/Postgres-extended-10-Repmgr-4.0.Dockerfile  | 4 ++--
 src/Postgres-extended-11-Repmgr-4.0.Dockerfile  | 4 ++--
 src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile | 4 ++--
 src/Postgres-extended-9.5-Repmgr-4.0.Dockerfile | 4 ++--
 src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile | 4 ++--
 src/Postgres-extended-9.6-Repmgr-4.0.Dockerfile | 4 ++--
 29 files changed, 85 insertions(+), 73 deletions(-)

diff --git a/src/Barman-2.3-Postgres-10.Dockerfile b/src/Barman-2.3-Postgres-10.Dockerfile
index 9dc0cd00..1fc6793c 100644
--- a/src/Barman-2.3-Postgres-10.Dockerfile
+++ b/src/Barman-2.3-Postgres-10.Dockerfile
@@ -16,12 +16,12 @@ RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/fun
 RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update && \
-     apt-get install -y libffi-dev libssl-dev openssh-server
+     apt-get install -y libffi-dev libssl-dev openssh-server python-argcomplete python-argh python-dateutil python-psycopg2 rsync
 
 RUN  apt-get install -y postgresql-client-10
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/b/barman/barman_2.3-2.pgdg90+1_all.deb"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/b/barman/barman_2.3-2.pgdg%2B1_all.deb"
 
 RUN apt-get -y install cron
 ADD barman/crontab /etc/cron.d/barman
diff --git a/src/Barman-2.3-Postgres-11.Dockerfile b/src/Barman-2.3-Postgres-11.Dockerfile
index 33547a43..427f7a0a 100644
--- a/src/Barman-2.3-Postgres-11.Dockerfile
+++ b/src/Barman-2.3-Postgres-11.Dockerfile
@@ -16,12 +16,12 @@ RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/fun
 RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update && \
-     apt-get install -y libffi-dev libssl-dev openssh-server
+     apt-get install -y libffi-dev libssl-dev openssh-server python-argcomplete python-argh python-dateutil python-psycopg2 rsync
 
 RUN  apt-get install -y postgresql-client-11
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/b/barman/barman_2.3-2.pgdg90+1_all.deb"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/b/barman/barman_2.3-2.pgdg%2B1_all.deb"
 
 RUN apt-get -y install cron
 ADD barman/crontab /etc/cron.d/barman
diff --git a/src/Barman-2.3-Postgres-9.6.Dockerfile b/src/Barman-2.3-Postgres-9.6.Dockerfile
index 3e3c327d..a6fb40eb 100644
--- a/src/Barman-2.3-Postgres-9.6.Dockerfile
+++ b/src/Barman-2.3-Postgres-9.6.Dockerfile
@@ -16,12 +16,12 @@ RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/fun
 RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update && \
-     apt-get install -y libffi-dev libssl-dev openssh-server
+     apt-get install -y libffi-dev libssl-dev openssh-server python-argcomplete python-argh python-dateutil python-psycopg2 rsync
 
 RUN  apt-get install -y postgresql-client-9.6
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/b/barman/barman_2.3-2.pgdg90+1_all.deb"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/b/barman/barman_2.3-2.pgdg%2B1_all.deb"
 
 RUN apt-get -y install cron
 ADD barman/crontab /etc/cron.d/barman
diff --git a/src/Barman-2.4-Postgres-10.Dockerfile b/src/Barman-2.4-Postgres-10.Dockerfile
index 2f2e4299..9bd82061 100644
--- a/src/Barman-2.4-Postgres-10.Dockerfile
+++ b/src/Barman-2.4-Postgres-10.Dockerfile
@@ -16,12 +16,12 @@ RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/fun
 RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update && \
-     apt-get install -y libffi-dev libssl-dev openssh-server
+     apt-get install -y libffi-dev libssl-dev openssh-server python-argcomplete python-argh python-dateutil python-psycopg2 rsync
 
 RUN  apt-get install -y postgresql-client-10
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/b/barman/barman_2.4-1.pgdg90+1_all.deb"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/b/barman/barman_2.4-1.pgdg%2B1_all.deb"
 
 RUN apt-get -y install cron
 ADD barman/crontab /etc/cron.d/barman
diff --git a/src/Barman-2.4-Postgres-11.Dockerfile b/src/Barman-2.4-Postgres-11.Dockerfile
index 0221250e..df7474ec 100644
--- a/src/Barman-2.4-Postgres-11.Dockerfile
+++ b/src/Barman-2.4-Postgres-11.Dockerfile
@@ -16,12 +16,12 @@ RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/fun
 RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update && \
-     apt-get install -y libffi-dev libssl-dev openssh-server
+     apt-get install -y libffi-dev libssl-dev openssh-server python-argcomplete python-argh python-dateutil python-psycopg2 rsync
 
 RUN  apt-get install -y postgresql-client-11
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/b/barman/barman_2.4-1.pgdg90+1_all.deb"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/b/barman/barman_2.4-1.pgdg%2B1_all.deb"
 
 RUN apt-get -y install cron
 ADD barman/crontab /etc/cron.d/barman
diff --git a/src/Barman-2.4-Postgres-9.6.Dockerfile b/src/Barman-2.4-Postgres-9.6.Dockerfile
index 86bb687d..9a3a2923 100644
--- a/src/Barman-2.4-Postgres-9.6.Dockerfile
+++ b/src/Barman-2.4-Postgres-9.6.Dockerfile
@@ -16,12 +16,12 @@ RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/fun
 RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key add - && \
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update && \
-     apt-get install -y libffi-dev libssl-dev openssh-server
+     apt-get install -y libffi-dev libssl-dev openssh-server python-argcomplete python-argh python-dateutil python-psycopg2 rsync
 
 RUN  apt-get install -y postgresql-client-9.6
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/b/barman/barman_2.4-1.pgdg90+1_all.deb"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/b/barman/barman_2.4-1.pgdg%2B1_all.deb"
 
 RUN apt-get -y install cron
 ADD barman/crontab /etc/cron.d/barman
diff --git a/src/Pgpool-3.3-Postgres-10.Dockerfile b/src/Pgpool-3.3-Postgres-10.Dockerfile
index a393c5ad..4b925931 100644
--- a/src/Pgpool-3.3-Postgres-10.Dockerfile
+++ b/src/Pgpool-3.3-Postgres-10.Dockerfile
@@ -20,13 +20,15 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update
 
-RUN  apt-get install -y postgresql-client-10
+RUN  apt-get install -y postgresql-client-10 postgresql-common
 
 
 RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
+
+
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_3.3.4-1.pgdg70+1_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.3.4-1.pgdg70+1_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_3.3.4-1.pgdg70%2B1_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_3.3.4-1.pgdg70%2B1_amd64.deb" "pgpool2"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
diff --git a/src/Pgpool-3.3-Postgres-11.Dockerfile b/src/Pgpool-3.3-Postgres-11.Dockerfile
index 1d19d51a..37d11cbc 100644
--- a/src/Pgpool-3.3-Postgres-11.Dockerfile
+++ b/src/Pgpool-3.3-Postgres-11.Dockerfile
@@ -20,13 +20,15 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update
 
-RUN  apt-get install -y postgresql-client-11
+RUN  apt-get install -y postgresql-client-11 postgresql-common
 
 
 RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
+
+
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_3.3.4-1.pgdg70+1_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.3.4-1.pgdg70+1_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_3.3.4-1.pgdg70%2B1_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_3.3.4-1.pgdg70%2B1_amd64.deb" "pgpool2"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
diff --git a/src/Pgpool-3.3-Postgres-9.6.Dockerfile b/src/Pgpool-3.3-Postgres-9.6.Dockerfile
index 22748c53..315247cf 100644
--- a/src/Pgpool-3.3-Postgres-9.6.Dockerfile
+++ b/src/Pgpool-3.3-Postgres-9.6.Dockerfile
@@ -20,13 +20,15 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update
 
-RUN  apt-get install -y postgresql-client-9.6
+RUN  apt-get install -y postgresql-client-9.6 postgresql-common
 
 
 RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
+
+
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_3.3.4-1.pgdg70+1_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.3.4-1.pgdg70+1_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_3.3.4-1.pgdg70%2B1_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_3.3.4-1.pgdg70%2B1_amd64.deb" "pgpool2"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
diff --git a/src/Pgpool-3.6-Postgres-10.Dockerfile b/src/Pgpool-3.6-Postgres-10.Dockerfile
index b38c12f3..9c0167ec 100644
--- a/src/Pgpool-3.6-Postgres-10.Dockerfile
+++ b/src/Pgpool-3.6-Postgres-10.Dockerfile
@@ -20,13 +20,14 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update
 
-RUN  apt-get install -y postgresql-client-10
+RUN  apt-get install -y postgresql-client-10 postgresql-common
+
+RUN apt-get install -y libmemcached11
 
 
-RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_3.6.7-1.pgdg90+1_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.6.7-1.pgdg90+1_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_3.6.7-1.pgdg%2B1_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_3.6.7-1.pgdg%2B1_amd64.deb" "pgpool2"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
diff --git a/src/Pgpool-3.6-Postgres-11.Dockerfile b/src/Pgpool-3.6-Postgres-11.Dockerfile
index 17242461..1b0aafc6 100644
--- a/src/Pgpool-3.6-Postgres-11.Dockerfile
+++ b/src/Pgpool-3.6-Postgres-11.Dockerfile
@@ -20,13 +20,14 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update
 
-RUN  apt-get install -y postgresql-client-11
+RUN  apt-get install -y postgresql-client-11 postgresql-common
+
+RUN apt-get install -y libmemcached11
 
 
-RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_3.6.7-1.pgdg90+1_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.6.7-1.pgdg90+1_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_3.6.7-1.pgdg%2B1_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_3.6.7-1.pgdg%2B1_amd64.deb" "pgpool2"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
diff --git a/src/Pgpool-3.6-Postgres-9.6.Dockerfile b/src/Pgpool-3.6-Postgres-9.6.Dockerfile
index 0783ff45..1dd2ca7c 100644
--- a/src/Pgpool-3.6-Postgres-9.6.Dockerfile
+++ b/src/Pgpool-3.6-Postgres-9.6.Dockerfile
@@ -20,13 +20,14 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update
 
-RUN  apt-get install -y postgresql-client-9.6
+RUN  apt-get install -y postgresql-client-9.6 postgresql-common
+
+RUN apt-get install -y libmemcached11
 
 
-RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_3.6.7-1.pgdg90+1_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.6.7-1.pgdg90+1_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_3.6.7-1.pgdg%2B1_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_3.6.7-1.pgdg%2B1_amd64.deb" "pgpool2"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
diff --git a/src/Pgpool-3.7-Postgres-10.Dockerfile b/src/Pgpool-3.7-Postgres-10.Dockerfile
index d4ba9839..950f5e54 100644
--- a/src/Pgpool-3.7-Postgres-10.Dockerfile
+++ b/src/Pgpool-3.7-Postgres-10.Dockerfile
@@ -20,13 +20,14 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update
 
-RUN  apt-get install -y postgresql-client-10
+RUN  apt-get install -y postgresql-client-10 postgresql-common
+
+RUN apt-get install -y libmemcached11
 
 
-RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_3.7.5-2.pgdg90+1_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.7.5-2.pgdg90+1_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_3.7.5-2.pgdg%2B1_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_3.7.5-2.pgdg%2B1_amd64.deb" "pgpool2"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
diff --git a/src/Pgpool-3.7-Postgres-11.Dockerfile b/src/Pgpool-3.7-Postgres-11.Dockerfile
index 5a00941b..3cac5a2f 100644
--- a/src/Pgpool-3.7-Postgres-11.Dockerfile
+++ b/src/Pgpool-3.7-Postgres-11.Dockerfile
@@ -20,13 +20,14 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update
 
-RUN  apt-get install -y postgresql-client-11
+RUN  apt-get install -y postgresql-client-11 postgresql-common
+
+RUN apt-get install -y libmemcached11
 
 
-RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_3.7.5-2.pgdg90+1_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.7.5-2.pgdg90+1_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_3.7.5-2.pgdg%2B1_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_3.7.5-2.pgdg%2B1_amd64.deb" "pgpool2"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
diff --git a/src/Pgpool-3.7-Postgres-9.6.Dockerfile b/src/Pgpool-3.7-Postgres-9.6.Dockerfile
index 71027eed..483223cc 100644
--- a/src/Pgpool-3.7-Postgres-9.6.Dockerfile
+++ b/src/Pgpool-3.7-Postgres-9.6.Dockerfile
@@ -20,13 +20,14 @@ RUN  wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
      sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' && \
      apt-get update
 
-RUN  apt-get install -y postgresql-client-9.6
+RUN  apt-get install -y postgresql-client-9.6 postgresql-common
+
+RUN apt-get install -y libmemcached11
 
 
-RUN install_deb_pkg "http://launchpadlibrarian.net/160156688/libmemcached10_1.0.8-1ubuntu2_amd64.deb" "libmemcached10"
 RUN install_deb_pkg "http://security-cdn.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.0.0_1.0.1t-1+deb8u12_amd64.deb" "libssl1.0.0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/libpgpool0_3.7.5-2.pgdg90+1_amd64.deb" "libpgpool0"
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/p/pgpool2/pgpool2_3.7.5-2.pgdg90+1_amd64.deb" "pgpool2"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/libpgpool0_3.7.5-2.pgdg%2B1_amd64.deb" "libpgpool0"
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/p/pgpool2/pgpool2_3.7.5-2.pgdg%2B1_amd64.deb" "pgpool2"
 
 RUN  wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \
      tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
diff --git a/src/Postgres-10-Repmgr-3.2.Dockerfile b/src/Postgres-10-Repmgr-3.2.Dockerfile
index b15c7ddf..d2fc9bae 100644
--- a/src/Postgres-10-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-10-Repmgr-3.2.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_3.3.2-1.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_3.3.2-1.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-10-Repmgr-4.0.Dockerfile b/src/Postgres-10-Repmgr-4.0.Dockerfile
index 887b81e3..b318b23d 100644
--- a/src/Postgres-10-Repmgr-4.0.Dockerfile
+++ b/src/Postgres-10-Repmgr-4.0.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_4.0.6-2.pgdg+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_4.0.6-2.pgdg%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-11-Repmgr-4.0.Dockerfile b/src/Postgres-11-Repmgr-4.0.Dockerfile
index 4372bf4f..3e30e692 100644
--- a/src/Postgres-11-Repmgr-4.0.Dockerfile
+++ b/src/Postgres-11-Repmgr-4.0.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_4.0.6-2.pgdg+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_4.0.6-2.pgdg%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-9.5-Repmgr-3.2.Dockerfile b/src/Postgres-9.5-Repmgr-3.2.Dockerfile
index 8c1fa8e3..6cba8584 100644
--- a/src/Postgres-9.5-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-9.5-Repmgr-3.2.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_3.3.2-1.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_3.3.2-1.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-9.5-Repmgr-4.0.Dockerfile b/src/Postgres-9.5-Repmgr-4.0.Dockerfile
index af4ec838..577ceabc 100644
--- a/src/Postgres-9.5-Repmgr-4.0.Dockerfile
+++ b/src/Postgres-9.5-Repmgr-4.0.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_4.0.6-2.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_4.0.6-2.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-9.6-Repmgr-3.2.Dockerfile b/src/Postgres-9.6-Repmgr-3.2.Dockerfile
index 9f33c5e1..297140f9 100644
--- a/src/Postgres-9.6-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-9.6-Repmgr-3.2.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_3.3.2-1.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_3.3.2-1.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-9.6-Repmgr-4.0.Dockerfile b/src/Postgres-9.6-Repmgr-4.0.Dockerfile
index 2c4cee13..7c5710c4 100644
--- a/src/Postgres-9.6-Repmgr-4.0.Dockerfile
+++ b/src/Postgres-9.6-Repmgr-4.0.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_4.0.6-2.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_4.0.6-2.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-extended-10-Repmgr-3.2.Dockerfile b/src/Postgres-extended-10-Repmgr-3.2.Dockerfile
index 497c0df6..81cd2615 100644
--- a/src/Postgres-extended-10-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-extended-10-Repmgr-3.2.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_3.3.2-1.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_3.3.2-1.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-extended-10-Repmgr-4.0.Dockerfile b/src/Postgres-extended-10-Repmgr-4.0.Dockerfile
index fe84f36a..d5d4ad18 100644
--- a/src/Postgres-extended-10-Repmgr-4.0.Dockerfile
+++ b/src/Postgres-extended-10-Repmgr-4.0.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_4.0.6-2.pgdg+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_4.0.6-2.pgdg%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-extended-11-Repmgr-4.0.Dockerfile b/src/Postgres-extended-11-Repmgr-4.0.Dockerfile
index 490a3ffa..54482913 100644
--- a/src/Postgres-extended-11-Repmgr-4.0.Dockerfile
+++ b/src/Postgres-extended-11-Repmgr-4.0.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_4.0.6-2.pgdg+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_4.0.6-2.pgdg%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile b/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile
index 27abe28e..7d424164 100644
--- a/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-extended-9.5-Repmgr-3.2.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_3.3.2-1.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_3.3.2-1.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-extended-9.5-Repmgr-4.0.Dockerfile b/src/Postgres-extended-9.5-Repmgr-4.0.Dockerfile
index e54cd961..be52cb3e 100644
--- a/src/Postgres-extended-9.5-Repmgr-4.0.Dockerfile
+++ b/src/Postgres-extended-9.5-Repmgr-4.0.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_4.0.6-2.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_4.0.6-2.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile b/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile
index 02bed03f..2a2d9de8 100644
--- a/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile
+++ b/src/Postgres-extended-9.6-Repmgr-3.2.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_3.3.2-1.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_3.3.2-1.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_3.3.2-1.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass
diff --git a/src/Postgres-extended-9.6-Repmgr-4.0.Dockerfile b/src/Postgres-extended-9.6-Repmgr-4.0.Dockerfile
index 30abd00a..65601ca9 100644
--- a/src/Postgres-extended-9.6-Repmgr-4.0.Dockerfile
+++ b/src/Postgres-extended-9.6-Repmgr-4.0.Dockerfile
@@ -11,8 +11,8 @@ COPY ./dockerfile/bin /usr/local/bin/dockerfile
 RUN chmod -R +x /usr/local/bin/dockerfile && ln -s /usr/local/bin/dockerfile/functions/* /usr/local/bin/
 
 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/repmgr-common_4.0.6-2.pgdg80+1_all.deb" 
-RUN install_deb_pkg "http://atalia.postgresql.org/morgue/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg80+1_amd64.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/repmgr-common_4.0.6-2.pgdg80%2B1_all.deb" 
+RUN install_deb_pkg "http://apt-archive.postgresql.org/pub/repos/apt/pool/main/r/repmgr/postgresql-$PG_MAJOR-repmgr_4.0.6-2.pgdg80%2B1_amd64.deb" 
 
 # Inherited variables
 # ENV POSTGRES_PASSWORD monkey_pass