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

Remove DB_NAME override

Browse Source
This commit is contained in:
Josh Santos 2024-04-07 19:33:17 -04:00
parent ed53a1e73a
commit cf77605d0d
No known key found for this signature in database
GPG Key ID: F40E8260EF912E41
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
15.0/entrypoint.sh
View File

@ -10,12 +10,11 @@ fi
# and pass them as arguments to the odoo process if not present in the config file # and pass them as arguments to the odoo process if not present in the config file
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
: ${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'}}}
ODOO_ARGS=() ODOO_ARGS=()
DB_ARGS=() DB_ARGS=("-d" "postgres")
function check_config() { function check_config() {
param="$1" param="$1"
@ -36,7 +35,6 @@ function check_config() {
fi fi
} }
check_config "db_name" "$NAME" "-d"
check_config "db_host" "$HOST" "-h" check_config "db_host" "$HOST" "-h"
check_config "db_port" "$PORT" "-p" check_config "db_port" "$PORT" "-p"
check_config "db_user" "$USER" "-U" check_config "db_user" "$USER" "-U"

4
16.0/entrypoint.sh
View File

@ -10,12 +10,11 @@ fi
# and pass them as arguments to the odoo process if not present in the config file # and pass them as arguments to the odoo process if not present in the config file
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
: ${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'}}}
ODOO_ARGS=() ODOO_ARGS=()
DB_ARGS=() DB_ARGS=("-d" "postgres")
function check_config() { function check_config() {
param="$1" param="$1"
@ -36,7 +35,6 @@ function check_config() {
fi fi
} }
check_config "db_name" "$NAME" "-d"
check_config "db_host" "$HOST" "-h" check_config "db_host" "$HOST" "-h"
check_config "db_port" "$PORT" "-p" check_config "db_port" "$PORT" "-p"
check_config "db_user" "$USER" "-U" check_config "db_user" "$USER" "-U"

4
17.0/entrypoint.sh
View File

@ -10,12 +10,11 @@ fi
# and pass them as arguments to the odoo process if not present in the config file # and pass them as arguments to the odoo process if not present in the config file
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}} : ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}} : ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
: ${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'}}}
ODOO_ARGS=() ODOO_ARGS=()
DB_ARGS=() DB_ARGS=("-d" "postgres")
function check_config() { function check_config() {
param="$1" param="$1"
@ -36,7 +35,6 @@ function check_config() {
fi fi
} }
check_config "db_name" "$NAME" "-d"
check_config "db_host" "$HOST" "-h" check_config "db_host" "$HOST" "-h"
check_config "db_port" "$PORT" "-p" check_config "db_port" "$PORT" "-p"
check_config "db_user" "$USER" "-U" check_config "db_user" "$USER" "-U"