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] [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 \