From c97e82a93a71cccf0f40ffbe646b4115c359ea79 Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Fri, 25 Nov 2016 16:30:50 +0100
Subject: [PATCH] [FIX] Odoo 9-10: `reload` handling

We were still trying to make the auto reload feature work with the 8.0
way in the dockerfile 9 and 10. This patch install the dependency used
in Odoo 9-10 (watchdog instead of pyinotify) and remove the
"auto-reload" key from the default configuration file, as the new syntax
is "--dev=reload".

The auto-reload is now disabled by default (it didn't work, let's not
bother someone that does not need it). The easiest way to use it is to
pass the arguments to the odoo process as:

docker run -p 8069:8069 --name odoo --link db:db -t odoo:[9.0|10.0] -- --dev=reload

fixes #84
fixes #98
---
 10.0/Dockerfile         | 2 +-
 10.0/odoo.conf          | 1 -
 9.0/Dockerfile          | 2 +-
 9.0/openerp-server.conf | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/10.0/Dockerfile b/10.0/Dockerfile
index 083ffac..417cc9f 100644
--- a/10.0/Dockerfile
+++ b/10.0/Dockerfile
@@ -10,9 +10,9 @@ RUN set -x; \
             node-less \
             python-gevent \
             python-pip \
-            python-pyinotify \
             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 \
diff --git a/10.0/odoo.conf b/10.0/odoo.conf
index 1518388..c3769ce 100644
--- a/10.0/odoo.conf
+++ b/10.0/odoo.conf
@@ -1,7 +1,6 @@
 [options]
 addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/odoo/addons
 data_dir = /var/lib/odoo
-auto_reload = True
 ; admin_passwd = admin
 ; csv_internal_sep = ,
 ; db_maxconn = 64
diff --git a/9.0/Dockerfile b/9.0/Dockerfile
index 006dbce..bf1739c 100644
--- a/9.0/Dockerfile
+++ b/9.0/Dockerfile
@@ -10,9 +10,9 @@ RUN set -x; \
             node-less \
             python-gevent \
             python-pip \
-            python-pyinotify \
             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 \
diff --git a/9.0/openerp-server.conf b/9.0/openerp-server.conf
index 0a1a0ed..8d9d297 100644
--- a/9.0/openerp-server.conf
+++ b/9.0/openerp-server.conf
@@ -1,7 +1,6 @@
 [options]
 addons_path = /mnt/extra-addons,/usr/lib/python2.7/dist-packages/openerp/addons
 data_dir = /var/lib/odoo
-auto_reload = True
 ; admin_passwd = admin
 ; csv_internal_sep = ,
 ; db_maxconn = 64