From 0f11373118c14ea375f27cd56792efa85eeccb93 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@forwardbias.in>
Date: Thu, 5 Jun 2014 13:02:04 -0700
Subject: [PATCH] app: env variables are part of container config

I don't completely grok the difference between container config
and host config.
---
 src/apptask.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/apptask.js b/src/apptask.js
index e95c00745..3f00f40ea 100644
--- a/src/apptask.js
+++ b/src/apptask.js
@@ -211,13 +211,22 @@ function startApp(app, callback) {
         callback();
     };
 
+    var env = [ ];
+    var portBindings = { };
+    portBindings[manifest.http_port + '/tcp'] = [ { HostPort: app.httpPort + '' } ];
+    if (typeof manifest.tcp_ports === 'object' && app.internalPort in manifest.tcp_ports) {
+        portBindings[app.internalPort + '/tcp'] = [ { HostPort: app.externalPort + '' } ];
+        env.push(manifest.tcp_ports[app.internalPort].environment_variable + '=' + app.externalPort);
+    }
+
     var containerOptions = {
         Hostname: app.location + '.' + HOSTNAME,
         Tty: true,
         Image: manifest.docker_image,
         Cmd: null,
         Volumes: { },
-        VolumesFrom: ''
+        VolumesFrom: '',
+        Env: env
     };
 
     debug('Running ' + manifest.docker_image);
@@ -234,14 +243,6 @@ function startApp(app, callback) {
         // TODO: should wait for update to complete
         appdb.update(app.id, { containerId: container.id }, NOOP_CALLBACK);
 
-        var env = [ ];
-        var portBindings = { };
-        portBindings[manifest.http_port + '/tcp'] = [ { HostPort: app.httpPort + '' } ];
-        if (typeof manifest.tcp_ports === 'object' && app.internalPort in manifest.tcp_ports) {
-            portBindings[app.internalPort + '/tcp'] = [ { HostPort: app.externalPort + '' } ];
-            env.push(manifest.tcp_ports[app.internalPort].environment_variable + '=' + app.externalPort);
-        }
-
         var startOptions = {
             // Binds: [ '/tmp:/tmp:rw' ],
             PortBindings: portBindings,