From 87a51ef76d57a8fc8dd71cd590043c74bd230474 Mon Sep 17 00:00:00 2001 From: Simo Kinnunen Date: Wed, 9 Jul 2014 23:26:27 +0900 Subject: [PATCH] Better compatibility with docker's --link option. --- lib/db/index.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/db/index.js b/lib/db/index.js index 22cd6bd7..cb71c9a6 100644 --- a/lib/db/index.js +++ b/lib/db/index.js @@ -8,10 +8,12 @@ var log = logger.createLogger('db') function connect() { return rutil.connect({ - host: process.env.RETHINKDB_PORT_28015_TCP_ADDR || 'localhost' + // These environment variables are exposed when we --link to a + // RethinkDB container. + host: process.env.RETHINKDB_PORT_28015_TCP_ADDR || '127.0.0.1' , port: process.env.RETHINKDB_PORT_28015_TCP_PORT || 28015 - , db: process.env.RETHINKDB_DATABASE || 'stf' - , authKey: process.env.RETHINKDB_AUTHKEY + , db: process.env.RETHINKDB_ENV_DATABASE || 'stf' + , authKey: process.env.RETHINKDB_ENV_AUTHKEY }) .then(function(conn) { lifecycle.observe(function() {