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

[IMP] add option to customize wait-for-psql.py timeout

Browse Source 
Allow users to pass a custom timeout value for the `wait-for-psql.py`
script to the container via the `PSQL_TIMEOUT` environment variable.
The timeout of 30 seconds still remains the default.
This commit is contained in:
Manu Miu 2020-11-28 16:40:26 +10:00
parent 920582ed77
commit 82976fd520
3 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
12.0/entrypoint.sh
View File

@ -8,17 +8,23 @@ set -e
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
: ${PSQL_TIMEOUT:=${DB_INIT_TIMEOUT:=30}}
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 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
DB_ARGS+=("--${param}")
DB_ARGS+=("${value}")
}
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"
@ -30,12 +36,12 @@ case "$1" in
if [[ "$1" == "scaffold" ]] ; then
exec odoo "$@"
else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
wait-for-psql.py ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}"
fi
;;
-*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
wait-for-psql.py ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}"
;;
*)

16
13.0/entrypoint.sh
View File

@ -8,17 +8,23 @@ set -e
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
: ${PSQL_TIMEOUT:=${DB_INIT_TIMEOUT:=30}}
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 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
DB_ARGS+=("--${param}")
DB_ARGS+=("${value}")
}
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"
@ -30,12 +36,12 @@ case "$1" in
if [[ "$1" == "scaffold" ]] ; then
exec odoo "$@"
else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
wait-for-psql.py ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}"
fi
;;
-*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
wait-for-psql.py ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}"
;;
*)

16
14.0/entrypoint.sh
View File

@ -8,17 +8,23 @@ set -e
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
: ${PSQL_TIMEOUT:=${DB_INIT_TIMEOUT:=30}}
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 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
DB_ARGS+=("--${param}")
DB_ARGS+=("${value}")
}
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"
@ -30,12 +36,12 @@ case "$1" in
if [[ "$1" == "scaffold" ]] ; then
exec odoo "$@"
else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
wait-for-psql.py ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}"
fi
;;
-*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
wait-for-psql.py ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}"
;;
*)