From 3c6dc4f45130e4cd8b10f65686884b15201cfb96 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sat, 27 Sep 2014 23:42:46 +0530 Subject: [PATCH] init: added support for orchardup/postgresql image --- README.md | 1 + assets/init | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/README.md b/README.md index 5de4ee58..867f3f25 100644 --- a/README.md +++ b/README.md @@ -381,6 +381,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/) ## Redis diff --git a/assets/init b/assets/init index 58d7aeb8..788b8ce4 100755 --- a/assets/init +++ b/assets/init @@ -137,6 +137,11 @@ elif [ -n "${POSTGRESQL_PORT_5432_TCP_ADDR}" ]; then DB_USER=${DB_USER:-${POSTGRESQL_ENV_DB_USER}} DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_DB_PASS}} DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB_NAME}} + + # support for linked orchardup/postgresql image + DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRESQL_USER}} + DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRESQL_PASS}} + DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRESQL_DB}} fi # set default user and database