This commit is contained in:
+20
-13
@@ -453,12 +453,19 @@ source "${ENV_FILE}"
|
|||||||
set +a
|
set +a
|
||||||
|
|
||||||
|
|
||||||
: "${POSTGRES_HOST:?POSTGRES_HOST not defined}"
|
|
||||||
: "${POSTGRES_PORT:?POSTGRES_PORT not defined}"
|
|
||||||
: "${POSTGRES_DB:?POSTGRES_DB not defined}"
|
|
||||||
: "${POSTGRES_USER:?POSTGRES_USER not defined}"
|
|
||||||
: "${POSTGRES_PASSWORD:?POSTGRES_PASSWORD not defined}"
|
|
||||||
|
|
||||||
|
DB_HOST="${DB_SERVER_HOST:-${POSTGRES_HOST:-}}"
|
||||||
|
DB_PORT="${DB_SERVER_PORT:-${POSTGRES_PORT:-5432}}"
|
||||||
|
DB_NAME="${POSTGRES_DB:-}"
|
||||||
|
DB_USER="${POSTGRES_USER:-}"
|
||||||
|
DB_PASSWORD="${POSTGRES_PASSWORD:-}"
|
||||||
|
|
||||||
|
|
||||||
|
: "${DB_HOST:?DB_SERVER_HOST not defined}"
|
||||||
|
: "${DB_PORT:?DB_SERVER_PORT not defined}"
|
||||||
|
: "${DB_NAME:?POSTGRES_DB not defined}"
|
||||||
|
: "${DB_USER:?POSTGRES_USER not defined}"
|
||||||
|
: "${DB_PASSWORD:?POSTGRES_PASSWORD not defined}"
|
||||||
|
|
||||||
export PGPASSWORD="${POSTGRES_PASSWORD}"
|
export PGPASSWORD="${POSTGRES_PASSWORD}"
|
||||||
export PGCONNECT_TIMEOUT=10
|
export PGCONNECT_TIMEOUT=10
|
||||||
@@ -753,8 +760,8 @@ EOF
|
|||||||
|
|
||||||
DB_TEST="$(
|
DB_TEST="$(
|
||||||
psql \
|
psql \
|
||||||
-h "${POSTGRES_HOST}" \
|
-h "${DB_HOST}" \
|
||||||
-p "${POSTGRES_PORT}" \
|
-p "${DB_PORT}" \
|
||||||
-U "${POSTGRES_USER}" \
|
-U "${POSTGRES_USER}" \
|
||||||
-d "${POSTGRES_DB}" \
|
-d "${POSTGRES_DB}" \
|
||||||
-Atqc 'SELECT 1;'
|
-Atqc 'SELECT 1;'
|
||||||
@@ -771,8 +778,8 @@ EOF
|
|||||||
|
|
||||||
SERVER_VERSION="$(
|
SERVER_VERSION="$(
|
||||||
psql \
|
psql \
|
||||||
-h "${POSTGRES_HOST}" \
|
-h "${DB_HOST}" \
|
||||||
-p "${POSTGRES_PORT}" \
|
-p "${DB_PORT}" \
|
||||||
-U "${POSTGRES_USER}" \
|
-U "${POSTGRES_USER}" \
|
||||||
-d "${POSTGRES_DB}" \
|
-d "${POSTGRES_DB}" \
|
||||||
-Atqc 'SHOW server_version;'
|
-Atqc 'SHOW server_version;'
|
||||||
@@ -817,8 +824,8 @@ EOF
|
|||||||
|
|
||||||
DB_SIZE="$(
|
DB_SIZE="$(
|
||||||
psql \
|
psql \
|
||||||
-h "${POSTGRES_HOST}" \
|
-h "${DB_HOST}" \
|
||||||
-p "${POSTGRES_PORT}" \
|
-p "${DB_PORT}" \
|
||||||
-U "${POSTGRES_USER}" \
|
-U "${POSTGRES_USER}" \
|
||||||
-d "${POSTGRES_DB}" \
|
-d "${POSTGRES_DB}" \
|
||||||
-Atqc \
|
-Atqc \
|
||||||
@@ -838,8 +845,8 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
pg_dump \
|
pg_dump \
|
||||||
-h "${POSTGRES_HOST}" \
|
-h "${DB_HOST}" \
|
||||||
-p "${POSTGRES_PORT}" \
|
-p "${DB_PORT}" \
|
||||||
-U "${POSTGRES_USER}" \
|
-U "${POSTGRES_USER}" \
|
||||||
-d "${POSTGRES_DB}" \
|
-d "${POSTGRES_DB}" \
|
||||||
--format=custom \
|
--format=custom \
|
||||||
|
|||||||
Reference in New Issue
Block a user