From dfa573a9c12bcece4720b9b1388a3b5ee67c7ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Tue, 4 Oct 2016 17:33:51 -0500 Subject: [PATCH] Update env vars with defaults --- 9.0/entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/9.0/entrypoint.sh b/9.0/entrypoint.sh index 8ec01b4..ce41742 100755 --- a/9.0/entrypoint.sh +++ b/9.0/entrypoint.sh @@ -3,10 +3,10 @@ set -e # set odoo database host, port, user and password -: ${PGHOST:=$DB_PORT_5432_TCP_ADDR} -: ${PGPORT:=$DB_PORT_5432_TCP_PORT} -: ${PGUSER:=${DB_ENV_POSTGRES_USER:='postgres'}} -: ${PGPASSWORD:=$DB_ENV_POSTGRES_PASSWORD} +: ${PGHOST:=${DB_PORT_5432_TCP_ADDR:='db'}} +: ${PGPORT:=${DB_PORT_5432_TCP_PORT:=5432}} +: ${PGUSER:=${DB_ENV_POSTGRES_USER:=${POSTGRES_USER:='postgres'}}} +: ${PGPASSWORD:=${DB_ENV_POSTGRES_PASSWORD:=$POSTGRES_PASSWORD}} export PGHOST PGPORT PGUSER PGPASSWORD case "$1" in