Skip to content

Commit ab612f2

Browse files
committed
[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 /`).
1 parent 13fba40 commit ab612f2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

10.0/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111
DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT)
1212

1313
case "$1" in
14-
--)
14+
-- | odoo)
1515
shift
1616
exec odoo "${DB_ARGS[@]}" "$@"
1717
;;

8.0/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111
DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT)
1212

1313
case "$1" in
14-
--)
14+
-- | openerp-server)
1515
shift
1616
exec openerp-server "${DB_ARGS[@]}" "$@"
1717
;;

9.0/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111
DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT)
1212

1313
case "$1" in
14-
--)
14+
-- | openerp-server)
1515
shift
1616
exec openerp-server "${DB_ARGS[@]}" "$@"
1717
;;

0 commit comments

Comments
 (0)