ffe62bdd52
As the wait-for-it script is started before the parsing of the command line, it is always started. It can be a problem if a user wants to start some other binary than odoo (for example a shell). Also, the wait-for-it script is only checking if a port is open on a host and then waits 5 seconds before starting Odoo. With this commit, the wait-for-it script is replaced by a more useful custom python script that checks if the postgresql server is able to handle a connection with the given parameters. Odoo then starts whenever it's ready or fails after a 30 sec timeout.
45 lines
1.1 KiB
Bash
Executable File
45 lines
1.1 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -e
|
|
|
|
# set the postgres database host, port, user and password according to the environment
|
|
# and pass them as arguments to the odoo process if not present in the config file
|
|
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
|
|
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
|
|
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
|
|
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
|
|
|
|
DB_ARGS=()
|
|
function check_config() {
|
|
param="$1"
|
|
value="$2"
|
|
if ! grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then
|
|
DB_ARGS+=("--${param}")
|
|
DB_ARGS+=("${value}")
|
|
fi;
|
|
}
|
|
check_config "db_host" "$HOST"
|
|
check_config "db_port" "$PORT"
|
|
check_config "db_user" "$USER"
|
|
check_config "db_password" "$PASSWORD"
|
|
|
|
case "$1" in
|
|
-- | odoo)
|
|
shift
|
|
if [[ "$1" == "scaffold" ]] ; then
|
|
exec odoo "$@"
|
|
else
|
|
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
|
exec odoo "$@" "${DB_ARGS[@]}"
|
|
fi
|
|
;;
|
|
-*)
|
|
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
|
exec odoo "$@" "${DB_ARGS[@]}"
|
|
;;
|
|
*)
|
|
exec "$@"
|
|
esac
|
|
|
|
exit 1
|