From c0b305834b4f0cb11605b3ef71add5c63449b87e Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Mon, 8 Oct 2018 15:51:06 +0200
Subject: [PATCH 01/13] [REF] Odoo 10.0-12.0: update to release 20181008

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

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index 2ce28e0..0ff84d0 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -23,10 +23,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 10.0
-ENV ODOO_RELEASE 20180808
+ENV ODOO_RELEASE 20181008
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '98736953010be3c578f4b9eb1c7e2c87da93a7bd odoo.deb' | sha1sum -c - \
+        && echo 'b94e32470287957ff4e1111e6c58e85c057f60db odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 7f548b9..adcb587 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -26,10 +26,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 11.0
-ENV ODOO_RELEASE 20180808
+ENV ODOO_RELEASE 20181008
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo 'a48d588b76fd642ac9e1af63a38e4d87ee20531a odoo.deb' | sha1sum -c - \
+        && echo '28804ea596ea88eeb1cec5c6089436af0bd67d57 odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 39e1ef2..dc42bda 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -26,10 +26,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 12.0
-ENV ODOO_RELEASE 20181004
+ENV ODOO_RELEASE 20181008
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '3c8718416df355bc823a0c1cb4af6b8141183a3b odoo.deb' | sha1sum -c - \
+        && echo 'caedca66b655268f2f0fb8d2661593dabbf46b88 odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \

From f71a22239e062719b202fb339f5983af88b2d1c8 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Mon, 8 Oct 2018 15:54:16 +0200
Subject: [PATCH 02/13] [REM] Odoo 9.0: remove deprecated version

---
 9.0/Dockerfile          | 55 -----------------------------------------
 9.0/entrypoint.sh       | 42 -------------------------------
 9.0/openerp-server.conf | 37 ---------------------------
 3 files changed, 134 deletions(-)
 delete mode 100644 9.0/Dockerfile
 delete mode 100755 9.0/entrypoint.sh
 delete mode 100644 9.0/openerp-server.conf

diff --git a/9.0/Dockerfile b/9.0/Dockerfile
deleted file mode 100644
index 900305a..0000000
--- a/9.0/Dockerfile
+++ /dev/null
@@ -1,55 +0,0 @@
-FROM debian:jessie
-MAINTAINER Odoo S.A. <info@odoo.com>
-
-# Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
-RUN set -x; \
-        apt-get update \
-        && apt-get install -y --no-install-recommends \
-            ca-certificates \
-            curl \
-            node-less \
-            python-gevent \
-            python-pip \
-            python-renderpm \
-            python-support \
-            python-watchdog \
-        && curl -o wkhtmltox.deb -SL http://nightly.odoo.com/extra/wkhtmltox-0.12.1.2_linux-jessie-amd64.deb \
-        && echo '40e8b906de658a2221b15e4e8cd82565a47d7ee8 wkhtmltox.deb' | sha1sum -c - \
-        && dpkg --force-depends -i wkhtmltox.deb \
-        && apt-get -y install -f --no-install-recommends \
-        && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false npm \
-        && rm -rf /var/lib/apt/lists/* wkhtmltox.deb \
-        && pip install psycogreen==1.0
-
-# Install Odoo
-ENV ODOO_VERSION 9.0
-ENV ODOO_RELEASE 20180808
-RUN set -x; \
-        curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}c.${ODOO_RELEASE}_all.deb \
-        && echo '25f90d98509484bc4b54174ccb814dd96ddb797b odoo.deb' | sha1sum -c - \
-        && dpkg --force-depends -i odoo.deb \
-        && apt-get update \
-        && apt-get -y install -f --no-install-recommends \
-        && rm -rf /var/lib/apt/lists/* odoo.deb
-
-# Copy entrypoint script and Odoo configuration file
-COPY ./entrypoint.sh /
-COPY ./openerp-server.conf /etc/odoo/
-RUN chown odoo /etc/odoo/openerp-server.conf
-
-# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
-RUN mkdir -p /mnt/extra-addons \
-        && chown -R odoo /mnt/extra-addons
-VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
-
-# Expose Odoo services
-EXPOSE 8069 8071
-
-# Set the default config file
-ENV OPENERP_SERVER /etc/odoo/openerp-server.conf
-
-# Set default user when running the container
-USER odoo
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["openerp-server"]
diff --git a/9.0/entrypoint.sh b/9.0/entrypoint.sh
deleted file mode 100755
index a958c3c..0000000
--- a/9.0/entrypoint.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# set the postgres database host, port, user and password according to the environment
-# and pass them as arguments to the odoo process if not present in the config file
-: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
-: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
-: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
-: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
-
-DB_ARGS=()
-function check_config() {
-    param="$1"
-    value="$2"
-    if ! grep -q -E "^\s*\b${param}\b\s*=" "$OPENERP_SERVER" ; then
-        DB_ARGS+=("--${param}")
-        DB_ARGS+=("${value}")
-   fi;
-}
-check_config "db_host" "$HOST"
-check_config "db_port" "$PORT"
-check_config "db_user" "$USER"
-check_config "db_password" "$PASSWORD"
-
-case "$1" in
-    -- | openerp-server)
-        shift
-        if [[ "$1" == "scaffold" ]] ; then
-            exec openerp-server "$@"
-        else
-            exec openerp-server "$@" "${DB_ARGS[@]}"
-        fi
-        ;;
-    -*)
-        exec openerp-server "$@" "${DB_ARGS[@]}"
-        ;;
-    *)
-        exec "$@"
-esac
-
-exit 1
diff --git a/9.0/openerp-server.conf b/9.0/openerp-server.conf
deleted file mode 100644
index 8d9d297..0000000
--- a/9.0/openerp-server.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-[options]
-addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/openerp/addons
-data_dir = /var/lib/odoo
-; admin_passwd = admin
-; csv_internal_sep = ,
-; db_maxconn = 64
-; db_name = False
-; db_template = template1
-; dbfilter = .*
-; debug_mode = False
-; email_from = False
-; limit_memory_hard = 2684354560
-; limit_memory_soft = 2147483648
-; limit_request = 8192
-; limit_time_cpu = 60
-; limit_time_real = 120
-; list_db = True
-; log_db = False
-; log_handler = [':INFO']
-; log_level = info
-; logfile = None
-; longpolling_port = 8072
-; max_cron_threads = 2
-; osv_memory_age_limit = 1.0
-; osv_memory_count_limit = False
-; smtp_password = False
-; smtp_port = 25
-; smtp_server = localhost
-; smtp_ssl = False
-; smtp_user = False
-; workers = 0
-; xmlrpc = True
-; xmlrpc_interface = 
-; xmlrpc_port = 8069
-; xmlrpcs = True
-; xmlrpcs_interface = 
-; xmlrpcs_port = 8071

From 3b5c6ae6aa21ea4d590a5d305fc9b0f4a447e218 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Fri, 9 Nov 2018 17:01:59 +0100
Subject: [PATCH 03/13] [REF] Odoo 10.0-12.0: update to release 20181109

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

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index 0ff84d0..1321f12 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -23,10 +23,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 10.0
-ENV ODOO_RELEASE 20181008
+ENV ODOO_RELEASE 20181109
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo 'b94e32470287957ff4e1111e6c58e85c057f60db odoo.deb' | sha1sum -c - \
+        && echo '8b24a5a3e36aed8986d3d6b19c8a255ee72cd658 odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index adcb587..007012b 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -26,10 +26,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 11.0
-ENV ODOO_RELEASE 20181008
+ENV ODOO_RELEASE 20181109
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '28804ea596ea88eeb1cec5c6089436af0bd67d57 odoo.deb' | sha1sum -c - \
+        && echo '04823230d99d16dbaf157c55cfad632db4559060 odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index dc42bda..beb6327 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -26,10 +26,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 12.0
-ENV ODOO_RELEASE 20181008
+ENV ODOO_RELEASE 20181109
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo 'caedca66b655268f2f0fb8d2661593dabbf46b88 odoo.deb' | sha1sum -c - \
+        && echo 'fcaa0f72ecc8a4fa5636948a8966f7584eab1fac odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \

From 05c776bcb2b0c8cda8d6fbb0bf93818b6c2625c7 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Mon, 26 Nov 2018 13:38:47 +0100
Subject: [PATCH 04/13] [FIX] Odoo 10.0-12.0: add missing packages

In Odoo, ldap, qrcode and vobject python modules are set as required in
odoo/setup.py. On the other hand, they are only recommendend in the
Debian package.

As a consequence, it was difficult to run some Odoo modules that
required one of them.

The Odoo Debian package was adapted in master where they were added as
dependencies in odoo/odoo@2ff49c5fcb584c8215ecbcb0034690e53732fb49 .

With this commit, they are installed in the Docker images.

This is a part of the fix of odoo/odoo#27752.
---
 10.0/Dockerfile | 3 +++
 11.0/Dockerfile | 9 ++++++---
 12.0/Dockerfile | 9 ++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index 1321f12..5dbebc8 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -9,9 +9,12 @@ RUN set -x; \
             curl \
             node-less \
             python-gevent \
+            python-ldap \
             python-pip \
+            python-qrcode \
             python-renderpm \
             python-support \
+            python-vobject \
             python-watchdog \
         && curl -o wkhtmltox.deb -SL http://nightly.odoo.com/extra/wkhtmltox-0.12.1.2_linux-jessie-amd64.deb \
         && echo '40e8b906de658a2221b15e4e8cd82565a47d7ee8 wkhtmltox.deb' | sha1sum -c - \
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 007012b..3eb1d19 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -10,13 +10,16 @@ RUN set -x; \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
+            libssl1.0-dev \
             node-less \
             python3-pip \
-            python3-setuptools \
+            python3-pyldap \
+            python3-qrcode \
             python3-renderpm \
-            libssl1.0-dev \
-            xz-utils \
+            python3-setuptools \
+            python3-vobject \
             python3-watchdog \
+            xz-utils \
         && curl -o wkhtmltox.tar.xz -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
         && echo '3f923f425d345940089e44c1466f6408b9619562 wkhtmltox.tar.xz' | sha1sum -c - \
         && tar xvf wkhtmltox.tar.xz \
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index beb6327..43903f4 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -10,13 +10,16 @@ RUN set -x; \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
+            libssl1.0-dev \
             node-less \
             python3-pip \
-            python3-setuptools \
+            python3-pyldap \
+            python3-qrcode \
             python3-renderpm \
-            libssl1.0-dev \
-            xz-utils \
+            python3-setuptools \
+            python3-vobject \
             python3-watchdog \
+            xz-utils \
         && curl -o wkhtmltox.tar.xz -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
         && echo '3f923f425d345940089e44c1466f6408b9619562 wkhtmltox.tar.xz' | sha1sum -c - \
         && tar xvf wkhtmltox.tar.xz \

From 5935496f14579dd4f0b04c8d680c585c1c7c518c Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Mon, 26 Nov 2018 14:10:38 +0100
Subject: [PATCH 05/13] [FIX] Odoo 10.0-12.0: update wkhtmltopdf to recommended
 version

wkhtmltopdf 0.12.5 is now the recommended version.
This commiit uses the Debian packages that exist for Jessie and Stretch.

Fixes #220
---
 10.0/Dockerfile |  4 ++--
 11.0/Dockerfile | 11 +++++------
 12.0/Dockerfile | 11 +++++------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index 5dbebc8..cbf8be0 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -16,8 +16,8 @@ RUN set -x; \
             python-support \
             python-vobject \
             python-watchdog \
-        && curl -o wkhtmltox.deb -SL http://nightly.odoo.com/extra/wkhtmltox-0.12.1.2_linux-jessie-amd64.deb \
-        && echo '40e8b906de658a2221b15e4e8cd82565a47d7ee8 wkhtmltox.deb' | sha1sum -c - \
+        && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.jessie_amd64.deb \
+        && echo '4d104ff338dc2d2083457b3b1e9baab8ddf14202 wkhtmltox.deb' | sha1sum -c - \
         && dpkg --force-depends -i wkhtmltox.deb \
         && apt-get -y install -f --no-install-recommends \
         && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false -o APT::AutoRemove::SuggestsImportant=false npm \
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 3eb1d19..dea09d4 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -20,12 +20,11 @@ RUN set -x; \
             python3-vobject \
             python3-watchdog \
             xz-utils \
-        && curl -o wkhtmltox.tar.xz -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
-        && echo '3f923f425d345940089e44c1466f6408b9619562 wkhtmltox.tar.xz' | sha1sum -c - \
-        && tar xvf wkhtmltox.tar.xz \
-        && cp wkhtmltox/lib/* /usr/local/lib/ \
-        && cp wkhtmltox/bin/* /usr/local/bin/ \
-        && cp -r wkhtmltox/share/man/man1 /usr/local/share/man/
+        && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
+        && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
+        && dpkg --force-depends -i wkhtmltox.deb\
+        && apt-get -y install -f --no-install-recommends \
+        && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
 
 # Install Odoo
 ENV ODOO_VERSION 11.0
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 43903f4..8d48358 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -20,12 +20,11 @@ RUN set -x; \
             python3-vobject \
             python3-watchdog \
             xz-utils \
-        && curl -o wkhtmltox.tar.xz -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \
-        && echo '3f923f425d345940089e44c1466f6408b9619562 wkhtmltox.tar.xz' | sha1sum -c - \
-        && tar xvf wkhtmltox.tar.xz \
-        && cp wkhtmltox/lib/* /usr/local/lib/ \
-        && cp wkhtmltox/bin/* /usr/local/bin/ \
-        && cp -r wkhtmltox/share/man/man1 /usr/local/share/man/
+        && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
+        && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
+        && dpkg --force-depends -i wkhtmltox.deb\
+        && apt-get -y install -f --no-install-recommends \
+        && rm -rf /var/lib/apt/lists/* wkhtmltox.deb
 
 # Install Odoo
 ENV ODOO_VERSION 12.0

From d0360678214b8f70970a2369a5a6b37981ab2c45 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Mon, 26 Nov 2018 14:15:56 +0100
Subject: [PATCH 06/13] [REF] Odoo 10.0-12.0: update to release 20181126

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

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index cbf8be0..ee1ab72 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -26,10 +26,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 10.0
-ENV ODOO_RELEASE 20181109
+ENV ODOO_RELEASE 20181126
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '8b24a5a3e36aed8986d3d6b19c8a255ee72cd658 odoo.deb' | sha1sum -c - \
+        && echo 'a68f31336b103c9cc334d8eb2f88bd5e754b5d74 odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index dea09d4..618b4eb 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -28,10 +28,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 11.0
-ENV ODOO_RELEASE 20181109
+ENV ODOO_RELEASE 20181126
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '04823230d99d16dbaf157c55cfad632db4559060 odoo.deb' | sha1sum -c - \
+        && echo '57e270cd958ca97b3920d7187c8967e1458d975c odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 8d48358..c2b1c83 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -28,10 +28,10 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 12.0
-ENV ODOO_RELEASE 20181109
+ENV ODOO_RELEASE 20181126
 RUN set -x; \
         curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo 'fcaa0f72ecc8a4fa5636948a8966f7584eab1fac odoo.deb' | sha1sum -c - \
+        && echo '30fb8530c596d5606b079c45f1be15f423431fdd odoo.deb' | sha1sum -c - \
         && dpkg --force-depends -i odoo.deb \
         && apt-get update \
         && apt-get -y install -f --no-install-recommends \

From 5cc7eae335ced1014b4f984e733e0093774618f9 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Tue, 29 Jan 2019 13:37:17 +0100
Subject: [PATCH 07/13] [FIX] Odoo 10.0-12.0: remove deprecated MAINTAINER
 instruction

The MAINTAINER instruction is deprecated since Docker version 1.13.
With this commit, the LABEL instruction is used instead.
---
 10.0/Dockerfile | 2 +-
 11.0/Dockerfile | 2 +-
 12.0/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index ee1ab72..e3c5183 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:jessie
-MAINTAINER Odoo S.A. <info@odoo.com>
+LABEL maintainer="Odoo S.A. <info@odoo.com>"
 
 # Install some deps, lessc and less-plugin-clean-css, and wkhtmltopdf
 RUN set -x; \
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 618b4eb..43f57dd 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:stretch
-MAINTAINER Odoo S.A. <info@odoo.com>
+LABEL maintainer="Odoo S.A. <info@odoo.com>"
 
 # Generate locale C.UTF-8 for postgres and general locale data
 ENV LANG C.UTF-8
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index c2b1c83..0ff9df4 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:stretch
-MAINTAINER Odoo S.A. <info@odoo.com>
+LABEL maintainer="Odoo S.A. <info@odoo.com>"
 
 # Generate locale C.UTF-8 for postgres and general locale data
 ENV LANG C.UTF-8

From 5ef3bee9dc1de5c5a486f6e2760c4a4de6e50da5 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Tue, 29 Jan 2019 14:03:05 +0100
Subject: [PATCH 08/13] [FIX] Odoo 10.0-12.0: make curl download quieter

When downloading wkhtmltopdf, curl shows a progress status unecessary
during the builds.
---
 10.0/Dockerfile | 2 +-
 11.0/Dockerfile | 2 +-
 12.0/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index e3c5183..4420ffa 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -16,7 +16,7 @@ RUN set -x; \
             python-support \
             python-vobject \
             python-watchdog \
-        && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.jessie_amd64.deb \
+        && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.jessie_amd64.deb \
         && echo '4d104ff338dc2d2083457b3b1e9baab8ddf14202 wkhtmltox.deb' | sha1sum -c - \
         && dpkg --force-depends -i wkhtmltox.deb \
         && apt-get -y install -f --no-install-recommends \
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 43f57dd..73a7e81 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -20,7 +20,7 @@ RUN set -x; \
             python3-vobject \
             python3-watchdog \
             xz-utils \
-        && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
+        && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
         && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
         && dpkg --force-depends -i wkhtmltox.deb\
         && apt-get -y install -f --no-install-recommends \
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 0ff9df4..667afab 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -20,7 +20,7 @@ RUN set -x; \
             python3-vobject \
             python3-watchdog \
             xz-utils \
-        && curl -o wkhtmltox.deb -SL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
+        && curl -o wkhtmltox.deb -sSL https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.5/wkhtmltox_0.12.5-1.stretch_amd64.deb \
         && echo '7e35a63f9db14f93ec7feeb0fce76b30c08f2057 wkhtmltox.deb' | sha1sum -c - \
         && dpkg --force-depends -i wkhtmltox.deb\
         && apt-get -y install -f --no-install-recommends \

From 01f0a1e508ef09641608a306b6323f4ecd5e3349 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Tue, 29 Jan 2019 14:34:05 +0100
Subject: [PATCH 09/13] [FIX] Odoo 10.0-12.0: use latest postgresql-client

As the Odoo Docker images are based on Debian Jessie and Stretch, they
use the postgresql-client package from the respective Debian repo.

The backup feature of Odoo uses the postgresql-client. As a consequence,
if a database server newer than the client is used, the backup may fail.

For example, when using the Odoo Docker image 10.0 against a postgresql
server 10.0, the backup fails.

With this commit, the latest postgresql-client is used from the Postgres
repository. As they seem to be backward compatible, the Odoo backup will
succeed wathever the client/server combination.

fixes odoo/odoo#30599
---
 10.0/Dockerfile | 7 +++++++
 11.0/Dockerfile | 8 ++++++++
 12.0/Dockerfile | 8 ++++++++
 3 files changed, 23 insertions(+)

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index 4420ffa..1dd1976 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -24,6 +24,13 @@ RUN set -x; \
         && rm -rf /var/lib/apt/lists/* wkhtmltox.deb \
         && pip install psycogreen==1.0
 
+# install latest postgresql-client
+RUN set -x; \
+        echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > etc/apt/sources.list.d/pgdg.list \
+        && curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+        && apt-get update  \
+        && apt-get install -y postgresql-client
+
 # Install Odoo
 ENV ODOO_VERSION 10.0
 ENV ODOO_RELEASE 20181126
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 73a7e81..8ba15ee 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -10,6 +10,7 @@ RUN set -x; \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
+            gnupg \
             libssl1.0-dev \
             node-less \
             python3-pip \
@@ -26,6 +27,13 @@ RUN set -x; \
         && apt-get -y install -f --no-install-recommends \
         && 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 \
+        && curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+        && apt-get update  \
+        && apt-get install -y postgresql-client
+
 # Install Odoo
 ENV ODOO_VERSION 11.0
 ENV ODOO_RELEASE 20181126
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 667afab..0bff965 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -10,6 +10,7 @@ RUN set -x; \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
+            gnupg \
             libssl1.0-dev \
             node-less \
             python3-pip \
@@ -26,6 +27,13 @@ RUN set -x; \
         && apt-get -y install -f --no-install-recommends \
         && 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 \
+        && curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+        && apt-get update  \
+        && apt-get install -y postgresql-client
+
 # Install Odoo
 ENV ODOO_VERSION 12.0
 ENV ODOO_RELEASE 20181126

From a1463daf598a958d6df9680b688436bc93ddf747 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Tue, 29 Jan 2019 14:41:08 +0100
Subject: [PATCH 10/13] [FIX] Odoo 11.0-12.0: add asian fonts and rtlcss

When printing a report, the asian fonts were missing.
Also, since Odoo 12.0, rtlcss is needed to support the right-to-left languages
in the Odoo UI.

With this commit, the noto-cjk fonts are added as well as the nodejs rtlcss tool.
---
 11.0/Dockerfile | 1 +
 12.0/Dockerfile | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 8ba15ee..f17bcf6 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -10,6 +10,7 @@ RUN set -x; \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
+            fonts-noto-cjk \
             gnupg \
             libssl1.0-dev \
             node-less \
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 0bff965..629fd6e 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -10,6 +10,7 @@ RUN set -x; \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
+            fonts-noto-cjk \
             gnupg \
             libssl1.0-dev \
             node-less \
@@ -34,6 +35,14 @@ RUN set -x; \
         && apt-get update  \
         && apt-get install -y postgresql-client
 
+# Install rtlcss (on Debian stretch)
+RUN set -x;\
+    curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
+    && echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get install -y nodejs \
+    && npm install -g rtlcss
+
 # Install Odoo
 ENV ODOO_VERSION 12.0
 ENV ODOO_RELEASE 20181126

From 4ab61856147123f7f1726c78c3da3f2136e435fe Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Tue, 29 Jan 2019 14:47:10 +0100
Subject: [PATCH 11/13] [REF] Odoo 10.0-12.0: update to release 20190128

the release timestamp and the verification sha1 are now using an ARG
instruction.

It means that they can be specified on the command line argument at the
build time.
---
 10.0/Dockerfile | 7 ++++---
 11.0/Dockerfile | 7 ++++---
 12.0/Dockerfile | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index 1dd1976..967a5b1 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -33,10 +33,11 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 10.0
-ENV ODOO_RELEASE 20181126
+ARG ODOO_RELEASE=20190128
+ARG ODOO_SHA=673bb5e45c006c9a822a0ca1a7d19989c03151ad
 RUN set -x; \
-        curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo 'a68f31336b103c9cc334d8eb2f88bd5e754b5d74 odoo.deb' | sha1sum -c - \
+        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 \
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index f17bcf6..328aa18 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -37,10 +37,11 @@ RUN set -x; \
 
 # Install Odoo
 ENV ODOO_VERSION 11.0
-ENV ODOO_RELEASE 20181126
+ARG ODOO_RELEASE=20190128
+ARG ODOO_SHA=30cb83ce38ec0b4a459e5590407cb2f9dcf46061
 RUN set -x; \
-        curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '57e270cd958ca97b3920d7187c8967e1458d975c odoo.deb' | sha1sum -c - \
+        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 \
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 629fd6e..3c24fdc 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -45,10 +45,11 @@ RUN set -x;\
 
 # Install Odoo
 ENV ODOO_VERSION 12.0
-ENV ODOO_RELEASE 20181126
+ARG ODOO_RELEASE=20190128
+ARG ODOO_SHA=9e34aaed2eb1e7697aaf36767247dbf335e9fe7a
 RUN set -x; \
-        curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odoo_${ODOO_VERSION}.${ODOO_RELEASE}_all.deb \
-        && echo '30fb8530c596d5606b079c45f1be15f423431fdd odoo.deb' | sha1sum -c - \
+        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 \

From 87f0174dca7fb69e504d0720104779989f00b368 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Wed, 30 Jan 2019 15:43:24 +0100
Subject: [PATCH 12/13] [FIX] Odoo 10.0-12.0: use a more secure way to download
 keys

At build time, curl is used to download gnupg keys without any
verification.

This does not meet the Docker hub requirements:
https://github.com/docker-library/official-images#security

With this commit, gpg is used to download the keys with the best method
specified in the requirements.
---
 10.0/Dockerfile |  6 +++++-
 11.0/Dockerfile |  7 ++++++-
 12.0/Dockerfile | 15 ++++++++++++---
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index 967a5b1..dabd05a 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -7,6 +7,7 @@ RUN set -x; \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
+            dirmngr \
             node-less \
             python-gevent \
             python-ldap \
@@ -27,7 +28,10 @@ RUN set -x; \
 # install latest postgresql-client
 RUN set -x; \
         echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > etc/apt/sources.list.d/pgdg.list \
-        && curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+        && export GNUPGHOME="$(mktemp -d)" \
+        && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8 \
+        && gpg --armor --export ACCC4CF8 | apt-key add - \
+        && rm -rf "$GNUPGHOME" \
         && apt-get update  \
         && apt-get install -y postgresql-client
 
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 328aa18..1b3f376 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -10,6 +10,7 @@ RUN set -x; \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
+            dirmngr \
             fonts-noto-cjk \
             gnupg \
             libssl1.0-dev \
@@ -31,7 +32,11 @@ 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 \
-        && curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+        && export GNUPGHOME="$(mktemp -d)" \
+        && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8 \
+        && gpg --armor --export ACCC4CF8 | apt-key add - \
+        && gpgconf --kill all \
+        && rm -rf "$GNUPGHOME" \
         && apt-get update  \
         && apt-get install -y postgresql-client
 
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 3c24fdc..380a7bf 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -10,6 +10,7 @@ RUN set -x; \
         && apt-get install -y --no-install-recommends \
             ca-certificates \
             curl \
+            dirmngr \
             fonts-noto-cjk \
             gnupg \
             libssl1.0-dev \
@@ -31,14 +32,22 @@ 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 \
-        && curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+        && export GNUPGHOME="$(mktemp -d)" \
+        && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8 \
+        && gpg --armor --export ACCC4CF8 | apt-key add - \
+        && gpgconf --kill all \
+        && rm -rf "$GNUPGHOME" \
         && apt-get update  \
         && apt-get install -y postgresql-client
 
 # Install rtlcss (on Debian stretch)
 RUN set -x;\
-    curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-    && echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
+    echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list \
+    && export GNUPGHOME="$(mktemp -d)" \
+    && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 68576280 \
+    && gpg --armor --export 68576280 | apt-key add - \
+    && gpgconf --kill all \
+    && rm -rf "$GNUPGHOME" \
     && apt-get update \
     && apt-get install -y nodejs \
     && npm install -g rtlcss

From d3e44ad1f340ceb42ec73c2be5b2d65042fe7a52 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Thu, 31 Jan 2019 17:18:17 +0100
Subject: [PATCH 13/13] [FIX] Odoo 10.0-12.0: use long ID's for gpg keys

Use long gpg ID's to avoid collisions.
---
 10.0/Dockerfile |  8 +++++---
 11.0/Dockerfile |  8 +++++---
 12.0/Dockerfile | 16 ++++++++++------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index dabd05a..99d118c 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -29,11 +29,13 @@ RUN set -x; \
 RUN set -x; \
         echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > etc/apt/sources.list.d/pgdg.list \
         && export GNUPGHOME="$(mktemp -d)" \
-        && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8 \
-        && gpg --armor --export ACCC4CF8 | apt-key add - \
+        && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
+        && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
+        && gpg --armor --export "${repokey}" | apt-key add - \
         && rm -rf "$GNUPGHOME" \
         && apt-get update  \
-        && apt-get install -y postgresql-client
+        && apt-get install -y postgresql-client \
+        && rm -rf /var/lib/apt/lists/*
 
 # Install Odoo
 ENV ODOO_VERSION 10.0
diff --git a/11.0/Dockerfile b/11.0/Dockerfile
index 1b3f376..af1ba80 100644
--- a/11.0/Dockerfile
+++ b/11.0/Dockerfile
@@ -33,12 +33,14 @@ RUN set -x; \
 RUN set -x; \
         echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \
         && export GNUPGHOME="$(mktemp -d)" \
-        && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8 \
-        && gpg --armor --export ACCC4CF8 | apt-key add - \
+        && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
+        && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
+        && gpg --armor --export "${repokey}" | apt-key add - \
         && gpgconf --kill all \
         && rm -rf "$GNUPGHOME" \
         && apt-get update  \
-        && apt-get install -y postgresql-client
+        && apt-get install -y postgresql-client \
+        && rm -rf /var/lib/apt/lists/*
 
 # Install Odoo
 ENV ODOO_VERSION 11.0
diff --git a/12.0/Dockerfile b/12.0/Dockerfile
index 380a7bf..b9ba03a 100644
--- a/12.0/Dockerfile
+++ b/12.0/Dockerfile
@@ -33,24 +33,28 @@ RUN set -x; \
 RUN set -x; \
         echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' > etc/apt/sources.list.d/pgdg.list \
         && export GNUPGHOME="$(mktemp -d)" \
-        && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys ACCC4CF8 \
-        && gpg --armor --export ACCC4CF8 | apt-key add - \
+        && repokey='B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8' \
+        && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
+        && gpg --armor --export "${repokey}" | apt-key add - \
         && gpgconf --kill all \
         && rm -rf "$GNUPGHOME" \
         && apt-get update  \
-        && apt-get install -y postgresql-client
+        && apt-get install -y postgresql-client \
+        && 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 \
     && export GNUPGHOME="$(mktemp -d)" \
-    && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 68576280 \
-    && gpg --armor --export 68576280 | apt-key add - \
+    && repokey='9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280' \
+    && gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "${repokey}" \
+    && gpg --armor --export "${repokey}" | apt-key add - \
     && gpgconf --kill all \
     && rm -rf "$GNUPGHOME" \
     && apt-get update \
     && apt-get install -y nodejs \
-    && npm install -g rtlcss
+    && npm install -g rtlcss \
+    && rm -rf /var/lib/apt/lists/*
 
 # Install Odoo
 ENV ODOO_VERSION 12.0