Simplify CMD to "openerp-server"
Set OPENERP_SERVER to specify config file
This commit is contained in:
parent
0ed964e2f9
commit
fb1e830501
@ -38,8 +38,11 @@ VOLUME ["/var/lib/odoo", "/mnt/extra-addons"]
|
|||||||
# Expose Odoo services
|
# Expose Odoo services
|
||||||
EXPOSE 8069 8071
|
EXPOSE 8069 8071
|
||||||
|
|
||||||
|
# Set the default config file
|
||||||
|
ENV OPENERP_SERVER /etc/odoo/openerp-server.conf
|
||||||
|
|
||||||
# Set default user when running the container
|
# Set default user when running the container
|
||||||
USER odoo
|
USER odoo
|
||||||
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
CMD ["/usr/bin/openerp-server", "--config=/etc/odoo/openerp-server.conf"]
|
CMD ["openerp-server"]
|
||||||
|
@ -10,7 +10,7 @@ set -e
|
|||||||
export PGHOST PGPORT PGUSER PGPASSWORD
|
export PGHOST PGPORT PGUSER PGPASSWORD
|
||||||
|
|
||||||
if [ "${1:0:1}" = '-' ]; then
|
if [ "${1:0:1}" = '-' ]; then
|
||||||
set -- /usr/bin/openerp-server --config=/etc/odoo/openerp-server.conf "$@"
|
set -- openerp-server "$@"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
Loading…
Reference in New Issue
Block a user