Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve PSQL wait script #496

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Improve PSQL wait script #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5740583
Improvements for psql wait script.
thatnerdjosh Mar 31, 2024
1a90a62
Update entrypoint to use new var
thatnerdjosh Mar 31, 2024
40564ac
Need to reset error if success.
thatnerdjosh Mar 31, 2024
3f7c82d
Remove SEED variable
thatnerdjosh Mar 31, 2024
6d3a90c
Migrate to pg_isready
thatnerdjosh Apr 1, 2024
ed53a1e
db_password is required for Odoo to start
thatnerdjosh Apr 1, 2024
cf77605
Remove DB_NAME override
thatnerdjosh Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions 15.0/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,31 @@ fi
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}

DB_ARGS=()
ODOO_ARGS=()
DB_ARGS=("-d" "postgres")

function check_config() {
param="$1"
value="$2"
pg_flag="$3"

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}")

ODOO_ARGS+=("--${param}")
ODOO_ARGS+=("${value}")

# Only add to DB_ARGS if pg_flag is set
if [[ -n "$pg_flag" ]]; then
DB_ARGS+=("${pg_flag}")
DB_ARGS+=("${value}")
fi
}
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"

check_config "db_host" "$HOST" "-h"
check_config "db_port" "$PORT" "-p"
check_config "db_user" "$USER" "-U"
check_config "db_password" "$PASSWORD"

case "$1" in
Expand All @@ -34,13 +46,13 @@ case "$1" in
if [[ "$1" == "scaffold" ]] ; then
exec odoo "$@"
else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
pg_isready ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${ODOO_ARGS[@]}"
fi
;;
-*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
pg_isready ${DB_ARGS[@]} --timeout=30
thatnerdjosh marked this conversation as resolved.
Show resolved Hide resolved
exec odoo "$@" "${ODOO_ARGS[@]}"
;;
*)
exec "$@"
Expand Down
32 changes: 0 additions & 32 deletions 15.0/wait-for-psql.py
View file
Open in desktop

This file was deleted.

32 changes: 22 additions & 10 deletions 16.0/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,31 @@ fi
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}

DB_ARGS=()
ODOO_ARGS=()
DB_ARGS=("-d" "postgres")

function check_config() {
param="$1"
value="$2"
pg_flag="$3"

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}")

ODOO_ARGS+=("--${param}")
ODOO_ARGS+=("${value}")

# Only add to DB_ARGS if pg_flag is set
if [[ -n "$pg_flag" ]]; then
DB_ARGS+=("${pg_flag}")
DB_ARGS+=("${value}")
fi
}
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"

check_config "db_host" "$HOST" "-h"
check_config "db_port" "$PORT" "-p"
check_config "db_user" "$USER" "-U"
check_config "db_password" "$PASSWORD"

case "$1" in
Expand All @@ -34,13 +46,13 @@ case "$1" in
if [[ "$1" == "scaffold" ]] ; then
exec odoo "$@"
else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
pg_isready ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${ODOO_ARGS[@]}"
fi
;;
-*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
pg_isready ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${ODOO_ARGS[@]}"
;;
*)
exec "$@"
Expand Down
32 changes: 0 additions & 32 deletions 16.0/wait-for-psql.py
View file
Open in desktop

This file was deleted.

32 changes: 22 additions & 10 deletions 17.0/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,31 @@ fi
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}

DB_ARGS=()
ODOO_ARGS=()
DB_ARGS=("-d" "postgres")

function check_config() {
param="$1"
value="$2"
pg_flag="$3"

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}")

ODOO_ARGS+=("--${param}")
ODOO_ARGS+=("${value}")

# Only add to DB_ARGS if pg_flag is set
if [[ -n "$pg_flag" ]]; then
DB_ARGS+=("${pg_flag}")
DB_ARGS+=("${value}")
fi
}
check_config "db_host" "$HOST"
check_config "db_port" "$PORT"
check_config "db_user" "$USER"

check_config "db_host" "$HOST" "-h"
check_config "db_port" "$PORT" "-p"
check_config "db_user" "$USER" "-U"
check_config "db_password" "$PASSWORD"

case "$1" in
Expand All @@ -34,13 +46,13 @@ case "$1" in
if [[ "$1" == "scaffold" ]] ; then
exec odoo "$@"
else
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
pg_isready ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${ODOO_ARGS[@]}"
fi
;;
-*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${DB_ARGS[@]}"
pg_isready ${DB_ARGS[@]} --timeout=30
exec odoo "$@" "${ODOO_ARGS[@]}"
;;
*)
exec "$@"
Expand Down
32 changes: 0 additions & 32 deletions 17.0/wait-for-psql.py
View file
Open in desktop

This file was deleted.