From 740e5dc53dcfddcf325cc3a22b6ac6477f24672b Mon Sep 17 00:00:00 2001 From: Christophe Monniez Date: Tue, 21 Jan 2020 10:33:48 +0100 Subject: [PATCH] [FIX] Odoo 11.0-13.0: use an absolute path for psql source list When creating an apt source list for Postgresql Debian package, the redirection uses a relative path. It works because the default WORKDIR but it's a fragile bad practice. Thanks to @fractalf and @alorence for the bug report and investigation. closes #287, closes #290 --- 11.0/Dockerfile | 2 +- 12.0/Dockerfile | 2 +- 13.0/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/11.0/Dockerfile b/11.0/Dockerfile index 31b58c6..ece4776 100644 --- a/11.0/Dockerfile +++ b/11.0/Dockerfile @@ -36,7 +36,7 @@ RUN set -x; \ # install latest postgresql-client RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \ + echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ diff --git a/12.0/Dockerfile b/12.0/Dockerfile index d375a06..7b00d8e 100644 --- a/12.0/Dockerfile +++ b/12.0/Dockerfile @@ -36,7 +36,7 @@ RUN set -x; \ # install latest postgresql-client RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \ + echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \ diff --git a/13.0/Dockerfile b/13.0/Dockerfile index f99aab5..18b3c8f 100644 --- a/13.0/Dockerfile +++ b/13.0/Dockerfile @@ -34,7 +34,7 @@ RUN set -x; \ # install latest postgresql-client RUN set -x; \ - echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > etc/apt/sources.list.d/pgdg.list \ + echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && export GNUPGHOME="$(mktemp -d)" \ && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \ && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \