Skip to content

Commit cf77605

Browse files
committed
Remove DB_NAME override
1 parent ed53a1e commit cf77605

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

15.0/entrypoint.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ fi
1010
# and pass them as arguments to the odoo process if not present in the config file
1111
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
1212
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
13-
: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
1413
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
1514
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
1615

1716
ODOO_ARGS=()
18-
DB_ARGS=()
17+
DB_ARGS=("-d" "postgres")
1918

2019
function check_config() {
2120
param="$1"
@@ -36,7 +35,6 @@ function check_config() {
3635
fi
3736
}
3837

39-
check_config "db_name" "$NAME" "-d"
4038
check_config "db_host" "$HOST" "-h"
4139
check_config "db_port" "$PORT" "-p"
4240
check_config "db_user" "$USER" "-U"

16.0/entrypoint.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ fi
1010
# and pass them as arguments to the odoo process if not present in the config file
1111
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
1212
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
13-
: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
1413
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
1514
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
1615

1716
ODOO_ARGS=()
18-
DB_ARGS=()
17+
DB_ARGS=("-d" "postgres")
1918

2019
function check_config() {
2120
param="$1"
@@ -36,7 +35,6 @@ function check_config() {
3635
fi
3736
}
3837

39-
check_config "db_name" "$NAME" "-d"
4038
check_config "db_host" "$HOST" "-h"
4139
check_config "db_port" "$PORT" "-p"
4240
check_config "db_user" "$USER" "-U"

17.0/entrypoint.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@ fi
1010
# and pass them as arguments to the odoo process if not present in the config file
1111
: ${HOST:=${DB_PORT_5432_TCP_ADDR:='db'}}
1212
: ${PORT:=${DB_PORT_5432_TCP_PORT:=5432}}
13-
: ${NAME:=${DB_ENV_POSTGRES_NAME:=${POSTGRES_NAME:='postgres'}}}
1413
: ${USER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='odoo'}}}
1514
: ${PASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=${POSTGRES_PASSWORD:='odoo'}}}
1615

1716
ODOO_ARGS=()
18-
DB_ARGS=()
17+
DB_ARGS=("-d" "postgres")
1918

2019
function check_config() {
2120
param="$1"
@@ -36,7 +35,6 @@ function check_config() {
3635
fi
3736
}
3837

39-
check_config "db_name" "$NAME" "-d"
4038
check_config "db_host" "$HOST" "-h"
4139
check_config "db_port" "$PORT" "-p"
4240
check_config "db_user" "$USER" "-U"

0 commit comments

Comments
 (0)