Simplify CMD to "openerp-server"

Set OPENERP_SERVER to specify config file
This commit is contained in:
Mike Dillon 2015-03-10 21:36:50 -07:00
parent 0ed964e2f9
commit fb1e830501
2 changed files with 5 additions and 2 deletions

View File

@ -38,8 +38,11 @@ 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
ENTRYPOINT ["/entrypoint.sh"]
CMD ["/usr/bin/openerp-server", "--config=/etc/odoo/openerp-server.conf"]
CMD ["openerp-server"]

View File

@ -10,7 +10,7 @@ set -e
export PGHOST PGPORT PGUSER PGPASSWORD
if [ "${1:0:1}" = '-' ]; then
set -- /usr/bin/openerp-server --config=/etc/odoo/openerp-server.conf "$@"
set -- openerp-server "$@"
fi
exec "$@"