Open-Harbor/docker-odoo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

[REF] Odoo 8.0-10.0: pass pg connection parameters as CLI arguments

Browse Source 
Do not assume that Odoo will handle correctly the PG* environment
variables, because it won't.

We also rename the PG* variables in order to avoid confusion since we do
not export them anymore.
This commit is contained in:
Simon Lejeune 2016-10-28 15:15:57 +02:00
parent 9621c46392
commit a3d207f2d4
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
10.0/entrypoint.sh
View File

@ -2,20 +2,21 @@
set -e
# set odoo database host, port, user and password
: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}}
: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}}
export PGHOST PGPORT PGUSER PGPASSWORD
# set the postgres database host, port, user and password
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}}
# pass them as arguments to the odoo process
DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT)
case "$1" in
--)
shift
exec odoo "$@"
exec odoo "${DB_ARGS[@]}" "$@"
;;
-*)
exec odoo "$@"
exec odoo "${DB_ARGS[@]}" "$@"
;;
*)
exec "$@"

17
8.0/entrypoint.sh
View File

@ -2,20 +2,21 @@
set -e
# set odoo database host, port, user and password
: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}}
: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}}
export PGHOST PGPORT PGUSER PGPASSWORD
# set the postgres database host, port, user and password
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}}
# pass them as arguments to the odoo process
DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT)
case "$1" in
--)
shift
exec openerp-server "$@"
exec openerp-server "${DB_ARGS[@]}" "$@"
;;
-*)
exec openerp-server "$@"
exec openerp-server "${DB_ARGS[@]}" "$@"
;;
*)
exec "$@"

17
9.0/entrypoint.sh
View File

@ -2,20 +2,21 @@
set -e
# set odoo database host, port, user and password
: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}}
: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}}
export PGHOST PGPORT PGUSER PGPASSWORD
# set the postgres database host, port, user and password
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}}
# pass them as arguments to the odoo process
DB_ARGS=("--db_user" $USER "--db_password" $PASSWORD "--db_host" $HOST "--db_port" $PORT)
case "$1" in
--)
shift
exec openerp-server "$@"
exec openerp-server "${DB_ARGS[@]}" "$@"
;;
-*)
exec openerp-server "$@"
exec openerp-server "${DB_ARGS[@]}" "$@"
;;
*)
exec "$@"