From 70d034642e69ed3401a101c797dee4c53b0cfb68 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sat, 27 Sep 2014 23:29:52 +0530 Subject: [PATCH] init: added support for centurylink/mysql and orchardup/mysql images --- README.md | 2 ++ assets/init | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/README.md b/README.md index 36872163..0a5ff69d 100644 --- a/README.md +++ b/README.md @@ -311,6 +311,8 @@ docker run --name=gitlab -d --link mysql:mysql \ The image will automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container using the magic of docker links and works with the following images: - [sameersbn/mysql](https://registry.hub.docker.com/u/sameersbn/mysql/) + - [centurylink/mysql](https://registry.hub.docker.com/u/centurylink/mysql/) + - [orchardup/mysql](https://registry.hub.docker.com/u/orchardup/mysql/) ### PostgreSQL diff --git a/assets/init b/assets/init index e5d95058..07ba7e1a 100755 --- a/assets/init +++ b/assets/init @@ -123,6 +123,11 @@ if [ -n "${MYSQL_PORT_3306_TCP_ADDR}" ]; then DB_USER=${DB_USER:-${MYSQL_ENV_DB_USER}} DB_PASS=${DB_PASS:-${MYSQL_ENV_DB_PASS}} DB_NAME=${DB_NAME:-${MYSQL_ENV_DB_NAME}} + + # support for linked orchardup/mysql and centurylink/mysql image + DB_USER=${DB_USER:-${MYSQL_ENV_MYSQL_USER}} + DB_PASS=${DB_PASS:-${MYSQL_ENV_MYSQL_PASSWORD}} + DB_NAME=${DB_NAME:-${MYSQL_ENV_MYSQL_DATABASE}} elif [ -n "${POSTGRESQL_PORT_5432_TCP_ADDR}" ]; then DB_TYPE=${DB_TYPE:-postgres} DB_HOST=${DB_HOST:-${POSTGRESQL_PORT_5432_TCP_ADDR}}