From 13fd5a11282f7127230ddf5c0a52b1d5552b56f4 Mon Sep 17 00:00:00 2001
From: Mike Dillon <mike@embody.org>
Date: Tue, 10 Mar 2015 21:36:50 -0700
Subject: [PATCH] [IMP] Set OPENERP_SERVER to specify config file

---
 8.0/Dockerfile | 3 +++
 8.0/run.sh     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 700be83..a52a268 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -38,6 +38,9 @@ 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
 
diff --git a/8.0/run.sh b/8.0/run.sh
index f0f637c..ade3963 100755
--- a/8.0/run.sh
+++ b/8.0/run.sh
@@ -12,4 +12,4 @@ export PGHOST PGPORT PGUSER PGPASSWORD
 [ "$1" != "--" ] && exec "$@"
 
 shift
-exec /usr/bin/openerp-server --config=/etc/odoo/openerp-server.conf "$@"
+exec /usr/bin/openerp-server "$@"