From 3f7c82d4fec67a2d0f81df825b9d8c85dc9280f2 Mon Sep 17 00:00:00 2001 From: Josh Santos Date: Sun, 31 Mar 2024 19:12:19 -0400 Subject: [PATCH] Remove SEED variable --- 15.0/entrypoint.sh | 10 ++-------- 16.0/entrypoint.sh | 10 ++-------- 17.0/entrypoint.sh | 10 ++-------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/15.0/entrypoint.sh b/15.0/entrypoint.sh index ecb48fc..73973c5 100755 --- a/15.0/entrypoint.sh +++ b/15.0/entrypoint.sh @@ -13,10 +13,8 @@ fi : ${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" @@ -33,10 +31,6 @@ 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 @@ -44,12 +38,12 @@ case "$1" in exec odoo "$@" else wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}" + exec odoo "$@" "${DB_ARGS[@]}" fi ;; -*) wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}" + exec odoo "$@" "${DB_ARGS[@]}" ;; *) exec "$@" diff --git a/16.0/entrypoint.sh b/16.0/entrypoint.sh index ecb48fc..73973c5 100755 --- a/16.0/entrypoint.sh +++ b/16.0/entrypoint.sh @@ -13,10 +13,8 @@ fi : ${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" @@ -33,10 +31,6 @@ 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 @@ -44,12 +38,12 @@ case "$1" in exec odoo "$@" else wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}" + exec odoo "$@" "${DB_ARGS[@]}" fi ;; -*) wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}" + exec odoo "$@" "${DB_ARGS[@]}" ;; *) exec "$@" diff --git a/17.0/entrypoint.sh b/17.0/entrypoint.sh index ecb48fc..73973c5 100755 --- a/17.0/entrypoint.sh +++ b/17.0/entrypoint.sh @@ -13,10 +13,8 @@ fi : ${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" @@ -33,10 +31,6 @@ 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 @@ -44,12 +38,12 @@ case "$1" in exec odoo "$@" else wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}" + exec odoo "$@" "${DB_ARGS[@]}" fi ;; -*) wait-for-psql.py ${DB_ARGS[@]} --timeout=30 - exec odoo "$@" "${DB_ARGS[@]}" "${ODOO_ARGS[@]}" + exec odoo "$@" "${DB_ARGS[@]}" ;; *) exec "$@"