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

Merge 82976fd520 into 9534c8c2fd

Browse Source
This commit is contained in:
Manu Miu 2021-09-11 16:59:26 +02:00 committed by GitHub
commit 1ed62c8d11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
12.0/entrypoint.sh
View File

@ -12,17 +12,23 @@ fi
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} : ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} : ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
: ${PSQL_TIMEOUT:=${DB_INIT_TIMEOUT:=30}}
DB_ARGS=() 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=$(
fi; grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" \
| cut -d " " -f3 \
| sed 's/["\n\r]//g'
)
fi
DB_ARGS+=("--${param}") DB_ARGS+=("--${param}")
DB_ARGS+=("${value}") 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"
@ -34,12 +40,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 ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
fi fi
;; ;;
-*) -*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30 wait-for-psql.py ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
;; ;;
*) *)

14
13.0/entrypoint.sh
View File

@ -12,17 +12,23 @@ fi
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} : ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} : ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
: ${PSQL_TIMEOUT:=${DB_INIT_TIMEOUT:=30}}
DB_ARGS=() 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=$(
fi; grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" \
| cut -d " " -f3 \
| sed 's/["\n\r]//g'
)
fi
DB_ARGS+=("--${param}") DB_ARGS+=("--${param}")
DB_ARGS+=("${value}") 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"
@ -34,12 +40,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 ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
fi fi
;; ;;
-*) -*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30 wait-for-psql.py ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
;; ;;
*) *)

14
14.0/entrypoint.sh
View File

@ -12,17 +12,23 @@ fi
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}} : ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} : ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
: ${PSQL_TIMEOUT:=${DB_INIT_TIMEOUT:=30}}
DB_ARGS=() 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=$(
fi; grep -E "^\s*\b${param}\b\s*=" "$ODOO_RC" \
| cut -d " " -f3 \
| sed 's/["\n\r]//g'
)
fi
DB_ARGS+=("--${param}") DB_ARGS+=("--${param}")
DB_ARGS+=("${value}") 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"
@ -34,12 +40,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 ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
fi fi
;; ;;
-*) -*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30 wait-for-psql.py ${DB_ARGS[@]} --timeout=$PSQL_TIMEOUT
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${DB_ARGS[@]}"
;; ;;
*) *)