init: added support for paintedfox/postgresql image

This commit is contained in:
Sameer Naik 2014-09-27 23:42:58 +05:30
parent 3c6dc4f451
commit ac2fe9bc37
2 changed files with 6 additions and 0 deletions

View File

@ -382,6 +382,7 @@ docker run --name=gitlab -d --link postgresql:postgresql \
The image will automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container using the magic of docker links and works with the following images:
- [sameersbn/postgresql](https://registry.hub.docker.com/u/sameersbn/postgresql/)
- [orchardup/postgresql](https://registry.hub.docker.com/u/orchardup/postgresql/)
- [paintedfox/postgresql](https://registry.hub.docker.com/u/paintedfox/postgresql/)
## Redis

View File

@ -142,6 +142,11 @@ elif [ -n "${POSTGRESQL_PORT_5432_TCP_ADDR}" ]; then
DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRESQL_USER}}
DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRESQL_PASS}}
DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRESQL_DB}}
# support for linked paintedfox/postgresql image
DB_USER=${DB_USER:-${POSTGRESQL_ENV_USER}}
DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_PASS}}
DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB}}
fi
# set default user and database