Update Dockerfile (#159)

* Update Dockerfile change PG repo according to https://www.postgresql.org/message-id/YBMtd6nRuXyU2zS4%40msg.df7cb.de
camptocamp · May 10, 2021 · ebe4ead · ebe4ead
1 parent ef96bbd
commit ebe4ead
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/10.0/Dockerfile b/10.0/Dockerfile
@@ -33,8 +33,8 @@ ENV PURGE_PACKAGE npm
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 RUN set -x; \
-        sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
-        && /install/package_odoo_9.0_10.0.sh \
+        /install/package_odoo_9.0_10.0.sh \
+        && sh -c 'echo "deb http://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
         && /install/setup-pip.sh \
         && /install/postgres.sh \
         && /install/wkhtml_12_1_2.sh \

diff --git a/7.0/Dockerfile b/7.0/Dockerfile
@@ -36,7 +36,7 @@ ENV PURGE_PACKAGE npm
 RUN set -x; \
         /install/package_odoo_9.0_10.0.sh \
         && /install/setup-pip.sh \
-        && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
+        && sh -c 'echo "deb http://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
         && /install/postgres.sh \
         && /install/wkhtml_12_1_2.sh \
         && /install/dev_package.sh \

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -36,7 +36,7 @@ ENV PURGE_PACKAGE npm
 RUN set -x; \
         /install/package_odoo_9.0_10.0.sh \
         && /install/setup-pip.sh \
-        && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
+        && sh -c 'echo "deb http://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
         && /install/postgres.sh \
         && /install/wkhtml_12_1_2.sh \
         && /install/dev_package.sh \

diff --git a/9.0/Dockerfile b/9.0/Dockerfile
@@ -33,8 +33,8 @@ ENV PURGE_PACKAGE npm
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 RUN set -x; \
-        sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
-        && /install/package_odoo_9.0_10.0.sh \
+        /install/package_odoo_9.0_10.0.sh \
+        && sh -c 'echo "deb http://apt-archive.postgresql.org/pub/repos/apt/ jessie-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
         && /install/setup-pip.sh \
         && /install/postgres.sh \
         && /install/wkhtml_12_1_2.sh \

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -26,6 +26,8 @@ Unreleased
 
 **Bugfixes**
 
+* switch apt url for PostgreSQL to apt-archive for jessie-based images
+    see https://www.postgresql.org/message-id/YBMtd6nRuXyU2zS4%40msg.df7cb.de
 **Libraries**
 
 **Build**

diff --git a/install/package_odoo_9.0_10.0.sh b/install/package_odoo_9.0_10.0.sh
@@ -6,6 +6,7 @@ apt-get update
 apt-get install -y --force-yes --no-install-recommends libc-ares2
 apt-get install -y --no-install-recommends \
     antiword \
+    apt-transport-https \
     ca-certificates \
     curl \
     ghostscript \