From ebe4eadc09b2e705d129397c45d2e10cb1bace9b Mon Sep 17 00:00:00 2001 From: Damien Crier Date: Mon, 10 May 2021 12:51:50 +0200 Subject: [PATCH] Update Dockerfile (#159) * Update Dockerfile change PG repo according to https://www.postgresql.org/message-id/YBMtd6nRuXyU2zS4%40msg.df7cb.de --- 10.0/Dockerfile | 4 ++-- 7.0/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- 9.0/Dockerfile | 4 ++-- HISTORY.rst | 2 ++ install/package_odoo_9.0_10.0.sh | 1 + 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/10.0/Dockerfile b/10.0/Dockerfile index 99bddc1c..bc01177b 100644 --- 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 index 72c6ea2d..d9f2e0a0 100644 --- 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 index 4be5ebc2..608f6309 100644 --- 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 index bda9a04e..e0eee142 100644 --- 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 index 5f699f9d..e94dbbcf 100644 --- 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 index d67ad67a..71e4fd86 100755 --- 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 \