diff --git a/odoo/dev.yml b/odoo/dev.yml index 691e39e..17a83df 100644 --- a/odoo/dev.yml +++ b/odoo/dev.yml @@ -28,6 +28,7 @@ services: dockerfile: Dockerfile.10.dev image: odoodev:yaltik10 environment: + DEV: 1 ADMIN_PASSWORD: dev LIST_DB: "True" DB_MAXCONN: 20 diff --git a/odoo/odoo/Dockerfile.10.dev b/odoo/odoo/Dockerfile.10.dev index 25a9c60..9725d86 100644 --- a/odoo/odoo/Dockerfile.10.dev +++ b/odoo/odoo/Dockerfile.10.dev @@ -4,3 +4,4 @@ MAINTAINER Yaltik - Fabien Bourgeois RUN pip install --user watchdog COPY shell10.sh ./ COPY launch10.dev.sh ./launch10.sh +ENV DEV 1 diff --git a/odoo/odoo/launch10.dev.sh b/odoo/odoo/launch10.dev.sh index 70609d9..39e231b 100644 --- a/odoo/odoo/launch10.dev.sh +++ b/odoo/odoo/launch10.dev.sh @@ -1,7 +1,11 @@ #!/bin/bash CONF=/opt/odoo/odoo.conf -ODOOCMD="python /opt/odoo/OCB/odoo-bin --config $CONF --dev all --log-handler :DEBUG" +ODOOCMD="python /opt/odoo/OCB/odoo-bin --config $CONF" + +if [ "$DEV" == 1 ]; then + ODOOCMD="$ODOOCMD --dev all --log-handler :DEBUG" +fi # Configuration generation and Odoo launch bash genconf.sh && $ODOOCMD