[FIX] Odoo 8.0-10.0: entrypoints: pass the pg parameters with CMD

When nothing is passed as argument to the docker container, the
entrypoint will receive the content of the CMD of the dockerfile. In
this case we have to pass the database configuration arguments, else
Odoo won't run correctly. This is the case when you run the command of
our documentation:

``` docker run -p 8069:8069 --name odoo --link db:db -t odoo ```

However, it should still be possible to run custom command (like `ls /`).
This commit is contained in:
Simon Lejeune 2016-11-03 14:17:25 +01:00
parent 13fba407e1
commit ab612f290f
3 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@ set -e
DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT)
case "$1" in
--)
-- | odoo)
shift
exec odoo "${DB_ARGS[@]}" "$@"
;;

View File

@ -11,7 +11,7 @@ set -e
DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT)
case "$1" in
--)
-- | openerp-server)
shift
exec openerp-server "${DB_ARGS[@]}" "$@"
;;

View File

@ -11,7 +11,7 @@ set -e
DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT)
case "$1" in
--)
-- | openerp-server)
shift
exec openerp-server "${DB_ARGS[@]}" "$@"
;;