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

Update entrypoint to use new var

Browse Source 
Missed one change.
This commit is contained in:
Josh Santos 2024-03-31 18:40:38 -04:00
parent 5740583e38
commit 1a90a625d4
No known key found for this signature in database
GPG Key ID: F40E8260EF912E41
3 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
15.0/entrypoint.sh
View File

@ -10,10 +10,13 @@ fi
# 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}}
: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
: ${SEED:=${DB_ENV_SEED:=false}}
DB_ARGS=()
ODOO_ARGS=()
function check_config() {
param="$1"
value="$2"
@ -23,11 +26,17 @@ function check_config() {
DB_ARGS+=("--${param}")
DB_ARGS+=("${value}")
}
check_config "db_name" "$NAME"
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"
check_config "db_password" "$PASSWORD"
if "$SEED" ; then
ODOO_ARGS+=("-i base")
fi
case "$1" in
-- | odoo)
shift
@ -35,12 +44,12 @@ case "$1" in
exec odoo "$@"
else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
fi
;;
-*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
;;
*)
exec "$@"

13
16.0/entrypoint.sh
View File

@ -10,10 +10,13 @@ fi
# 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}}
: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
: ${SEED:=${DB_ENV_SEED:=false}}
DB_ARGS=()
ODOO_ARGS=()
function check_config() {
param="$1"
value="$2"
@ -23,11 +26,17 @@ function check_config() {
DB_ARGS+=("--${param}")
DB_ARGS+=("${value}")
}
check_config "db_name" "$NAME"
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"
check_config "db_password" "$PASSWORD"
if "$SEED" ; then
ODOO_ARGS+=("-i base")
fi
case "$1" in
-- | odoo)
shift
@ -35,12 +44,12 @@ case "$1" in
exec odoo "$@"
else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
fi
;;
-*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
;;
*)
exec "$@"

13
17.0/entrypoint.sh
View File

@ -10,10 +10,13 @@ fi
# 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}}
: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
: ${SEED:=${DB_ENV_SEED:=false}}
DB_ARGS=()
ODOO_ARGS=()
function check_config() {
param="$1"
value="$2"
@ -23,11 +26,17 @@ function check_config() {
DB_ARGS+=("--${param}")
DB_ARGS+=("${value}")
}
check_config "db_name" "$NAME"
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"
check_config "db_password" "$PASSWORD"
if "$SEED" ; then
ODOO_ARGS+=("-i base")
fi
case "$1" in
-- | odoo)
shift
@ -35,12 +44,12 @@ case "$1" in
exec odoo "$@"
else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
fi
;;
-*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
;;
*)
exec "$@"