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

[FIX] Odoo 14.0-16.0: don't pass parameters from the config to the command line

Browse Source 
Odoo will already use those values, passing them through the command line is not necessary
Fixes #334
This commit is contained in:
Benjamin Demarteau 2023-03-22 10:04:34 +01:00
parent c61918a027
commit 8db89c11e3
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
14.0/entrypoint.sh
View File

@ -14,11 +14,15 @@ fi
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} : ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
DB_ARGS=() DB_ARGS=()
ODOO_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')
else
ODOO_ARGS+=("--${param}")
ODOO_ARGS+=("${value}")
fi; fi;
DB_ARGS+=("--${param}") DB_ARGS+=("--${param}")
DB_ARGS+=("${value}") DB_ARGS+=("${value}")
@ -34,13 +38,13 @@ 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=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${ODOO_ARGS[@]}"
fi fi
;; ;;
-*) -*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30 wait-for-psql.py "${DB_ARGS[@]}" --timeout=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${ODOO_ARGS[@]}"
;; ;;
*) *)
exec "$@" exec "$@"

14
15.0/entrypoint.sh
View File

@ -14,11 +14,15 @@ fi
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} : ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
DB_ARGS=() DB_ARGS=()
ODOO_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')
else
ODOO_ARGS+=("--${param}")
ODOO_ARGS+=("${value}")
fi; fi;
DB_ARGS+=("--${param}") DB_ARGS+=("--${param}")
DB_ARGS+=("${value}") DB_ARGS+=("${value}")
@ -34,13 +38,13 @@ 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=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${ODOO_ARGS[@]}"
fi fi
;; ;;
-*) -*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30 wait-for-psql.py "${DB_ARGS[@]}" --timeout=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${ODOO_ARGS[@]}"
;; ;;
*) *)
exec "$@" exec "$@"

14
16.0/entrypoint.sh
View File

@ -14,11 +14,15 @@ fi
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}} : ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
DB_ARGS=() DB_ARGS=()
ODOO_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')
else
ODOO_ARGS+=("--${param}")
ODOO_ARGS+=("${value}")
fi; fi;
DB_ARGS+=("--${param}") DB_ARGS+=("--${param}")
DB_ARGS+=("${value}") DB_ARGS+=("${value}")
@ -34,13 +38,13 @@ 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=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${ODOO_ARGS[@]}"
fi fi
;; ;;
-*) -*)
wait-for-psql.py ${DB_ARGS[@]} --timeout=30 wait-for-psql.py "${DB_ARGS[@]}" --timeout=30
exec odoo "$@" "${DB_ARGS[@]}" exec odoo "$@" "${ODOO_ARGS[@]}"
;; ;;
*) *)
exec "$@" exec "$@"