From b4779b0e56be7264735dc9bf1bd837dca8f0d89e Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Tue, 31 Mar 2020 15:39:25 +0200
Subject: [PATCH 1/7] [IMP] Odoo 11.0-13.0: also exports port 8072

Although the `EXPOSE` instruction does not actually publish the ports,
it has an impact on inter docker communication.

With this commit, port 8072 is also exposed.

Closes #107
---
 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 6131128..3d3a244 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -72,7 +72,7 @@ RUN chown odoo /etc/odoo/odoo.conf \
 VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
 # Expose Odoo services
-EXPOSE 8069 8071
+EXPOSE 8069 8071 8072
 
 # Set the default config file
 ENV ODOO_RC /etc/odoo/odoo.conf
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index d180d6a..13510d3 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -86,7 +86,7 @@ RUN chown odoo /etc/odoo/odoo.conf \
 VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
 # Expose Odoo services
-EXPOSE 8069 8071
+EXPOSE 8069 8071 8072
 
 # Set the default config file
 ENV ODOO_RC /etc/odoo/odoo.conf
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index 8627f22..da31f5d 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -74,7 +74,7 @@ RUN chown odoo /etc/odoo/odoo.conf \
 VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
 # Expose Odoo services
-EXPOSE 8069 8071
+EXPOSE 8069 8071 8072
 
 # Set the default config file
 ENV ODOO_RC /etc/odoo/odoo.conf

From d38f9ccc04a60121d45bb9a33d87930b5a5cd3df Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Fri, 17 Apr 2020 11:07:57 +0200
Subject: [PATCH 2/7] [REF] Odoo 11.0-13.0: update to release 20200417

Closes #298
---
 11.0/Dockerfile | 4 ++--
 12.0/Dockerfile | 4 ++--
 13.0/Dockerfile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 3d3a244..1d313ca 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -51,8 +51,8 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 11.0
-ARG ODOO_RELEASE=20200121
-ARG ODOO_SHA=13f30434cb4fb28b11d78fd4e7c616d03362f779
+ARG ODOO_RELEASE=20200417
+ARG ODOO_SHA=e21c34a263785eea09babd7a0d876ba05c841935
 RUN set -x; \
         curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 13510d3..790f436 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -65,8 +65,8 @@ RUN set -x;\
 
 # Install Odoo
 ENV ODOO_VERSION 12.0
-ARG ODOO_RELEASE=20200121
-ARG ODOO_SHA=cb0bcb5d239983468c2e3b3f7cf17f58df820b1c
+ARG ODOO_RELEASE=20200417
+ARG ODOO_SHA=ca4a7485b0b75850ffe1458a8f3266839400a501
 RUN set -x; \
         curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index da31f5d..4df42f5 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -53,8 +53,8 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 13.0
-ARG ODOO_RELEASE=20200121
-ARG ODOO_SHA=770d71cfafb9a8f8419b88f8033b964d5742ad57
+ARG ODOO_RELEASE=20200417
+ARG ODOO_SHA=db29fbcebf63f9f656e9445f462190ac775ee533
 RUN set -x; \
         curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \

From 9323219289a159fbc3b0bf0281962c3655189444 Mon Sep 17 00:00:00 2001
From: Andris <andras0602@hotmail.com>
Date: Sun, 2 Feb 2020 17:20:40 +0100
Subject: [PATCH 3/7] [FIX] Odoo 11.0-13.0: install odoo deb in one pass

Before this commit, the deb package was installed in two steps.
The first step was to use dpkg and force the install, the second step
was to repair the broken install.
---
 11.0/Dockerfile | 3 +--
 12.0/Dockerfile | 3 +--
 13.0/Dockerfile | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 1d313ca..482b08a 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -56,9 +56,8 @@ ARG ODOO_SHA=e21c34a263785eea09babd7a0d876ba05c841935
 RUN set -x; \
         curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
-        && dpkg --force-depends -i odoo.deb \
         && apt-get update \
-        && apt-get -y install -f --no-install-recommends \
+        && apt-get -y install --no-install-recommends ./odoo.deb\
         && rm -rf /var/lib/apt/lists/* odoo.deb
 
 # Copy entrypoint script and Odoo configuration file
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 790f436..a8b680d 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -70,9 +70,8 @@ ARG ODOO_SHA=ca4a7485b0b75850ffe1458a8f3266839400a501
 RUN set -x; \
         curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
-        && dpkg --force-depends -i odoo.deb \
         && apt-get update \
-        && apt-get -y install -f --no-install-recommends \
+        && apt-get -y install --no-install-recommends ./odoo.deb \
         && rm -rf /var/lib/apt/lists/* odoo.deb
 
 # Copy entrypoint script and Odoo configuration file
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index 4df42f5..11789fb 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -58,9 +58,8 @@ ARG ODOO_SHA=db29fbcebf63f9f656e9445f462190ac775ee533
 RUN set -x; \
         curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
-        && dpkg --force-depends -i odoo.deb \
         && apt-get update \
-        && apt-get -y install -f --no-install-recommends \
+        && apt-get -y install --no-install-recommends ./odoo.deb \
         && rm -rf /var/lib/apt/lists/* odoo.deb
 
 # Copy entrypoint script and Odoo configuration file

From 3e06fdf97d0105362fdfff42fc8a271b4f4cc9db Mon Sep 17 00:00:00 2001
From: Andris <andras0602@hotmail.com>
Date: Sun, 2 Feb 2020 16:03:29 +0100
Subject: [PATCH 4/7] [FIX] Odoo 11.0-13.0: set the default shell to bash

It appears that dash can be unpredictable.

Also, uses the `pipefail` as stated in the Dockerfile best practice [1].

[1] https://github.com/docker/docker.github.io/blob/master/develop/develop-images/dockerfile_best-practices.md#using-pipes
---
 11.0/Dockerfile | 11 +++++------
 12.0/Dockerfile | 14 ++++++--------
 13.0/Dockerfile | 14 ++++++--------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 482b08a..505bc9a 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -1,6 +1,8 @@
 FROM debian:stretch-slim
 MAINTAINER Odoo S.A. <info@odoo.com>
 
+SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
+
 # Generate locale C.UTF-8 for postgres and general locale data
 ENV LANG C.UTF-8
 
@@ -8,8 +10,7 @@ ENV LANG C.UTF-8
 RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
-RUN set -x; \
-        apt-get update \
+RUN apt-get update \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
@@ -37,8 +38,7 @@ RUN set -x; \
         && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
 
 # 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 \
+RUN 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}" \
@@ -53,8 +53,7 @@ RUN set -x; \
 ENV ODOO_VERSION 11.0
 ARG ODOO_RELEASE=20200417
 ARG ODOO_SHA=e21c34a263785eea09babd7a0d876ba05c841935
-RUN set -x; \
-        curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
+RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
         && apt-get update \
         && apt-get -y install --no-install-recommends ./odoo.deb\
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index a8b680d..20d4321 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -1,6 +1,8 @@
 FROM debian:stretch-slim
 MAINTAINER Odoo S.A. <info@odoo.com>
 
+SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
+
 # Generate locale C.UTF-8 for postgres and general locale data
 ENV LANG C.UTF-8
 
@@ -8,8 +10,7 @@ ENV LANG C.UTF-8
 RUN echo 'deb http://deb.debian.org/debian stretch-backports main' > /etc/apt/sources.list.d/backports.list
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
-RUN set -x; \
-        apt-get update \
+RUN apt-get update \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
@@ -37,8 +38,7 @@ RUN set -x; \
         && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
 
 # 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 \
+RUN 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}" \
@@ -50,8 +50,7 @@ RUN set -x; \
         && rm -rf /var/lib/apt/lists/*
 
 # Install rtlcss (on Debian stretch)
-RUN set -x;\
-    echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
+RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
     && export GNUPGHOME="$(mktemp -d)" \
     && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
     && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
@@ -67,8 +66,7 @@ RUN set -x;\
 ENV ODOO_VERSION 12.0
 ARG ODOO_RELEASE=20200417
 ARG ODOO_SHA=ca4a7485b0b75850ffe1458a8f3266839400a501
-RUN set -x; \
-        curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
+RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
         && apt-get update \
         && apt-get -y install --no-install-recommends ./odoo.deb \
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index 11789fb..f11a88c 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -1,12 +1,13 @@
 FROM debian:buster-slim
 MAINTAINER Odoo S.A. <info@odoo.com>
 
+SHELL ["/bin/bash", "-xo", "pipefail", "-c"]
+
 # Generate locale C.UTF-8 for postgres and general locale data
 ENV LANG C.UTF-8
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
-RUN set -x; \
-        apt-get update \
+RUN apt-get update \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
@@ -35,8 +36,7 @@ RUN set -x; \
         && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
 
 # 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 \
+RUN 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}" \
@@ -48,15 +48,13 @@ RUN set -x; \
         && rm -rf /var/lib/apt/lists/*
 
 # Install rtlcss (on Debian buster)
-RUN set -x; \
-    npm install -g rtlcss
+RUN npm install -g rtlcss
 
 # Install Odoo
 ENV ODOO_VERSION 13.0
 ARG ODOO_RELEASE=20200417
 ARG ODOO_SHA=db29fbcebf63f9f656e9445f462190ac775ee533
-RUN set -x; \
-        curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
+RUN curl -o odoo.deb -sSL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
         && echo "${ODOO_SHA} odoo.deb" | sha1sum -c - \
         && apt-get update \
         && apt-get -y install --no-install-recommends ./odoo.deb \

From 91a9019df72754210493d840132a94e1bc32bed7 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Fri, 17 Apr 2020 14:12:06 +0200
Subject: [PATCH 5/7] [IMP] Odoo 11.0-13.0: avoid to install unnecessary
 packages

---
 11.0/Dockerfile | 2 +-
 12.0/Dockerfile | 4 ++--
 13.0/Dockerfile | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 505bc9a..640224a 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -46,7 +46,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc
         && gpgconf --kill all \
         && rm -rf "$GNUPGHOME" \
         && apt-get update  \
-        && apt-get install -y postgresql-client \
+        && apt-get install --no-install-recommends -y postgresql-client \
         && rm -rf /var/lib/apt/lists/*
 
 # Install Odoo
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 20d4321..887762f 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -46,7 +46,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc
         && gpgconf --kill all \
         && rm -rf "$GNUPGHOME" \
         && apt-get update  \
-        && apt-get install -y postgresql-client \
+        && apt-get install --no-install-recommends -y postgresql-client \
         && rm -rf /var/lib/apt/lists/*
 
 # Install rtlcss (on Debian stretch)
@@ -58,7 +58,7 @@ RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/source
     && gpgconf --kill all \
     && rm -rf "$GNUPGHOME" \
     && apt-get update \
-    && apt-get install -y nodejs \
+    && apt-get install --no-install-recommends -y nodejs \
     && npm install -g rtlcss \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index f11a88c..b1bb1f5 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -44,7 +44,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/
         && gpgconf --kill all \
         && rm -rf "$GNUPGHOME" \
         && apt-get update  \
-        && apt-get install -y postgresql-client \
+        && apt-get install --no-install-recommends -y postgresql-client \
         && rm -rf /var/lib/apt/lists/*
 
 # Install rtlcss (on Debian buster)

From 22ddf056d53bdab8d398d6a28cfef76ed955eca0 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Fri, 17 Apr 2020 14:48:23 +0200
Subject: [PATCH 6/7] [IMP] Odoo 11.0-13.0: avoid masking return value of
 mktemp

---
 11.0/Dockerfile | 3 ++-
 12.0/Dockerfile | 6 ++++--
 13.0/Dockerfile | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 640224a..015fbf2 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -39,7 +39,8 @@ RUN apt-get update \
 
 # install latest postgresql-client
 RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
-        && export GNUPGHOME="$(mktemp -d)" \
+        && GNUPGHOME="$(mktemp -d)" \
+        && export GNUPGHOME \
         && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
         && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
         && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 887762f..791890b 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -39,7 +39,8 @@ RUN apt-get update \
 
 # install latest postgresql-client
 RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
-        && export GNUPGHOME="$(mktemp -d)" \
+        && GNUPGHOME="$(mktemp -d)" \
+        && export GNUPGHOME \
         && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
         && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
         && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \
@@ -51,7 +52,8 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc
 
 # Install rtlcss (on Debian stretch)
 RUN echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
-    && export GNUPGHOME="$(mktemp -d)" \
+    && GNUPGHOME="$(mktemp -d)" \
+    && export GNUPGHOME \
     && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
     && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
     && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/nodejs.gpg.asc \
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index b1bb1f5..9213acd 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -37,7 +37,8 @@ RUN apt-get update \
 
 # install latest postgresql-client
 RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/apt/sources.list.d/pgdg.list \
-        && export GNUPGHOME="$(mktemp -d)" \
+        && GNUPGHOME="$(mktemp -d)" \
+        && export GNUPGHOME \
         && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
         && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
         && gpg --batch --armor --export "${repokey}" > /etc/apt/trusted.gpg.d/pgdg.gpg.asc \

From f116a674ca62595d0fbf1ded206ec2e4d962ebf0 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Fri, 17 Apr 2020 16:15:25 +0200
Subject: [PATCH 7/7] [FIX] Odoo 11.0-13.0: remove postgres source list after
 usage

When installing postgresql-client, the Debian repo from Postgresql is added as a source list.
As a consequence, when installing the Odoo debian packages, the
package dependencies are also searched in the Postgresql repo.

In this case, it appears that python3-werkzeug version 0.16 was
installed from the Postgresql repo.

Closes #299
---
 11.0/Dockerfile | 1 +
 12.0/Dockerfile | 1 +
 13.0/Dockerfile | 1 +
 3 files changed, 3 insertions(+)

diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 015fbf2..57ab859 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -48,6 +48,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc
         && rm -rf "$GNUPGHOME" \
         && apt-get update  \
         && apt-get install --no-install-recommends -y postgresql-client \
+        && rm -f /etc/apt/sources.list.d/pgdg.list \
         && rm -rf /var/lib/apt/lists/*
 
 # Install Odoo
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 791890b..26d6071 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -48,6 +48,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > /etc
         && rm -rf "$GNUPGHOME" \
         && apt-get update  \
         && apt-get install --no-install-recommends -y postgresql-client \
+        && rm -f /etc/apt/sources.list.d/pgdg.list \
         && rm -rf /var/lib/apt/lists/*
 
 # Install rtlcss (on Debian stretch)
diff --git a/13.0/Dockerfile b/13.0/Dockerfile
index 9213acd..9ec1be3 100644
--- a/13.0/Dockerfile
+++ b/13.0/Dockerfile
@@ -46,6 +46,7 @@ RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main' > /etc/
         && rm -rf "$GNUPGHOME" \
         && apt-get update  \
         && apt-get install --no-install-recommends -y postgresql-client \
+        && rm -f /etc/apt/sources.list.d/pgdg.list \
         && rm -rf /var/lib/apt/lists/*
 
 # Install rtlcss (on Debian buster)