update entrypoint to seperate db_arg for odoo and python wait-for-pgql.py script
All checks were successful
Build, Secure, and Push Docker Image on Release / build-and-push (release) Successful in 3m29s
All checks were successful
Build, Secure, and Push Docker Image on Release / build-and-push (release) Successful in 3m29s
This commit is contained in:
parent
c0622e2428
commit
51295e2011
@ -15,15 +15,23 @@ fi
|
||||
: ${DB_NAME:=${DB_ENV_POSTGRES_DB_NAME:=${POSTGRES_DB_NAME:='odoo'}}}
|
||||
|
||||
DB_ARGS=()
|
||||
PY_DB_ARGS=()
|
||||
function check_config() {
|
||||
param="$1"
|
||||
value="$2"
|
||||
if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then
|
||||
value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g')
|
||||
fi;
|
||||
|
||||
if [ "${param}" != "db_name" ]; then
|
||||
DB_ARGS+=("--${param}")
|
||||
DB_ARGS+=("${value}")
|
||||
fi;
|
||||
|
||||
PY_DB_ARGS+=("--${param}")
|
||||
PY_DB_ARGS+=("${value}")
|
||||
}
|
||||
|
||||
check_config "db_host" "$HOST"
|
||||
check_config "db_port" "$PORT"
|
||||
check_config "db_user" "$USER"
|
||||
@ -36,12 +44,12 @@ case "$1" in
|
||||
if [[ "$1" == "scaffold" ]] ; then
|
||||
exec odoo "$@"
|
||||
else
|
||||
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
||||
wait-for-psql.py ${PY_DB_ARGS[@]} --timeout=30
|
||||
exec odoo "$@" "${DB_ARGS[@]}"
|
||||
fi
|
||||
;;
|
||||
-*)
|
||||
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
|
||||
wait-for-psql.py ${PY_DB_ARGS[@]} --timeout=30
|
||||
exec odoo "$@" "${DB_ARGS[@]}"
|
||||
;;
|
||||
*)
|
||||
|
Loading…
Reference in New Issue
Block a user