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

Compare commits

base: Open-Harbor:master
Branches Tags
Open-Harbor:master
Open-Harbor:master-add-test-images-moc
Open-Harbor:18.0-rc2
Open-Harbor:18.0-rc1
..
compare: Open-Harbor:18.0-rc1
Branches Tags
Open-Harbor:master
Open-Harbor:master-add-test-images-moc
Open-Harbor:18.0-rc2
Open-Harbor:18.0-rc1

No commits in common. "master" and "18.0-rc1" have entirely different histories.
master ... 18.0-rc1

1 changed files with 4 additions and 12 deletions
Show Stats Expand all files Collapse all files

12
18.0/entrypoint.sh
View File

@ -15,23 +15,15 @@ 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;
if [ "${param}" != "db_name" ]; then
DB_ARGS+=("--${param}") DB_ARGS+=("--${param}")
DB_ARGS+=("${value}") 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"
@ -44,12 +36,12 @@ case "$1" in
if [[ "$1" == "scaffold" ]] ; then if [[ "$1" == "scaffold" ]] ; then
exec odoo "$@" exec odoo "$@"
else else
wait-for-psql.py ${PY_DB_ARGS[@]} --timeout=30 wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
fi fi
;; ;;
-*) -*)
wait-for-psql.py ${PY_DB_ARGS[@]} --timeout=30 wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
;; ;;
*) *)