From 4c855a573d78e8865f789050cded7acc60a76c7c Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Fri, 27 Feb 2015 18:38:06 +0100
Subject: [PATCH] [ADD] extra addons dir for users addons

Set auto-reload to True in the default configuration so that update of
python and xml files does not need a restart of the server.

auto-reload options requires python-pyinotify to be installed.
---
 8.0/Dockerfile          | 5 +++--
 8.0/openerp-server.conf | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index bb67313fd..db9e4c5f5 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -9,6 +9,7 @@ RUN apt-get update \
             curl \
             npm \
             python-support \
+            python-pyinotify \
         && npm install -g less less-plugin-clean-css \
         && ln -s /usr/bin/nodejs /usr/bin/node \
         && curl -o wkhtmltox.deb -SL http://nightly.odoo.com/extra/wkhtmltox-0.12.1.2_linux-jessie-amd64.deb \
@@ -38,7 +39,7 @@ RUN curl -o odoo.deb -SL http://nightly.odoo.com/${ODOO_VERSION}/nightly/deb/odo
 COPY ./run.sh /
 COPY ./openerp-server.conf /etc/odoo/
 
-# Mount /var/lib/odoo to allow restoring filestore
-VOLUME ["/var/lib/odoo"]
+# Mount /var/lib/odoo to allow restoring filestore and /mnt/extra-addons for users addons
+VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
 
 CMD ["/run.sh"]
diff --git a/8.0/openerp-server.conf b/8.0/openerp-server.conf
index ccc8caf4b..0ca62deb4 100644
--- a/8.0/openerp-server.conf
+++ b/8.0/openerp-server.conf
@@ -1,11 +1,11 @@
 [options]
-addons_path = /usr/lib/python2.7/dist-packages/openerp/addons
+addons_path = /usr/lib/python2.7/dist-packages/openerp/addons,/mnt/extra-addons
+auto_reload = True
 db_host = False
 db_password = False
 db_port = False
 db_user = odoo
 ; admin_passwd = admin
-; auto_reload = False
 ; csv_internal_sep = ,
 ; data_dir = False
 ; db_maxconn = 64