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

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
Details

Browse Source
This commit is contained in:
Mathias Beaulieu-Duncan 2024-12-30 14:33:26 -05:00
parent c0622e2428
commit 51295e2011
Signed by: mathias
GPG Key ID: 8C3667DADE3B6303
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
18.0/entrypoint.sh
View File

@ -15,15 +15,23 @@ fi
: ${DB_NAME:=${DB_ENV_POSTGRES_DB_NAME:=${POSTGRES_DB_NAME:='odoo'}}} : ${DB_NAME:=${DB_ENV_POSTGRES_DB_NAME:=${POSTGRES_DB_NAME:='odoo'}}}
DB_ARGS=() DB_ARGS=()
PY_DB_ARGS=()
function check_config() { function check_config() {
param="$1" param="$1"
value="$2" value="$2"
if grep -q -E "^\s*\b${param}\b\s*=" "$ODOO_RC" ; then 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') value=$(grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" |cut -d " " -f3|sed 's/["\n\r]//g')
fi; fi;
DB_ARGS+=("--${param}")
DB_ARGS+=("${value}") 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_host" "$HOST"
check_config "db_port" "$PORT" check_config "db_port" "$PORT"
check_config "db_user" "$USER" check_config "db_user" "$USER"
@ -36,12 +44,12 @@ case "$1" in
if [[ "$1" == "scaffold" ]] ; then if [[ "$1" == "scaffold" ]] ; then
exec odoo "$@" exec odoo "$@"
else else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30 wait-for-psql.py ${PY_DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
fi fi
;; ;;
-*) -*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30 wait-for-psql.py ${PY_DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
;; ;;
*) *)