Update entrypoint to use new var

odoo · Mar 31, 2024 · fb45459 · fb45459
1 parent 5740583
commit fb45459
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/15.0/entrypoint.sh b/15.0/entrypoint.sh
@@ -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,19 +26,25 @@ 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
  if [[ "$1" == "scaffold" ]] ; then
  exec odoo "$@"
  else
  wait-for-psql.py ${DB_ARGS[@]} --timeout=30
- exec odoo "$@" "${DB_ARGS[@]}"
+ exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
  fi
  ;;
  -*)

diff --git a/16.0/entrypoint.sh b/16.0/entrypoint.sh
@@ -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,19 +26,25 @@ 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
  if [[ "$1" == "scaffold" ]] ; then
  exec odoo "$@"
  else
  wait-for-psql.py ${DB_ARGS[@]} --timeout=30
- exec odoo "$@" "${DB_ARGS[@]}"
+ exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
  fi
  ;;
  -*)

diff --git a/17.0/entrypoint.sh b/17.0/entrypoint.sh
@@ -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,19 +26,25 @@ 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
  if [[ "$1" == "scaffold" ]] ; then
  exec odoo "$@"
  else
  wait-for-psql.py ${DB_ARGS[@]} --timeout=30
- exec odoo "$@" "${DB_ARGS[@]}"
+ exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}"
  fi
  ;;
  -*)
@@ -46,4 +55,4 @@ case "$1" in
  exec "$@"
 esac
 
-exit 1
+exit 1