From 85366eda789c952c28ef24f7c79fcebe94378bf1 Mon Sep 17 00:00:00 2001
From: Samus CTO <cto@openerp.com>
Date: Fri, 27 Feb 2015 15:56:14 +0100
Subject: [PATCH] [IMP] remove config file because it's built-in with the
 package

---
 8.0/Dockerfile          |  2 --
 8.0/openerp-server.conf | 42 -----------------------------------------
 8.0/run.sh              |  3 ++-
 3 files changed, 2 insertions(+), 45 deletions(-)
 delete mode 100644 8.0/openerp-server.conf

diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 4c56c9e..1f19cbf 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -32,8 +32,6 @@ RUN apt-key adv --keyserver pgp.mit.edu --recv-keys 0xdef2a2198183cbb5 \
 
 # Run script and Odoo configuration file
 COPY ./run.sh /
-COPY ./openerp-server.conf /etc/odoo/
-RUN chown odoo /etc/odoo/openerp-server.conf
 
 # Mount /var/lib/odoo to allow restoring filestore
 VOLUME ["/var/lib/odoo"]
diff --git a/8.0/openerp-server.conf b/8.0/openerp-server.conf
deleted file mode 100644
index 14117bb..0000000
--- a/8.0/openerp-server.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-[options]
-addons_path = /usr/lib/python2.7/dist-packages/openerp/addons
-; 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
-; 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
diff --git a/8.0/run.sh b/8.0/run.sh
index 5d7607b..20d5ecc 100755
--- a/8.0/run.sh
+++ b/8.0/run.sh
@@ -6,5 +6,6 @@ export PGPORT=$DB_PORT_5432_TCP_PORT
 export PGUSER=$DB_ENV_POSTGRES_USER
 export PGPASSWORD=$DB_ENV_POSTGRES_PASSWORD
 
-# start Odoo
+[ "$1" != "--" ] && exec "$@"
+
 exec /usr/bin/openerp-server --config=/etc/odoo/openerp-server.conf "$@"