Merge pull request #235 from mmerickel/fix.official-postgres-image-linking

support linking with official postgres image
This commit is contained in:
Sameer Naik 2015-01-10 08:57:07 +05:30
commit 2d50f11a6f

View File

@ -138,6 +138,11 @@ elif [ -n "${POSTGRESQL_PORT_5432_TCP_ADDR}" ]; then
DB_HOST=${DB_HOST:-${POSTGRESQL_PORT_5432_TCP_ADDR}}
DB_PORT=${DB_PORT:-${POSTGRESQL_PORT_5432_TCP_PORT}}
# support for linked official postgres image
DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRES_USER}}
DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRES_PASS}}
DB_NAME=${DB_NAME:-${DB_USER}}
# support for linked sameersbn/postgresql image
DB_USER=${DB_USER:-${POSTGRESQL_ENV_DB_USER}}
DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_DB_PASS}}