[IMP] remove config file because it's built-in with the package

This commit is contained in:
Samus CTO 2015-02-27 15:56:14 +01:00
parent 097483779d
commit 85366eda78
3 changed files with 2 additions and 45 deletions

View File

@ -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"]

View File

@ -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

View File

@ -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 "$@"