From dedf1d61a70866852fd60c7e4a01f99d17f3a986 Mon Sep 17 00:00:00 2001
From: TeckniX <lokitek@gmail.com>
Date: Wed, 27 May 2015 10:50:50 -0400
Subject: [PATCH 1/3] Modified docker cli to use proper shell

---
 src/utils/DockerMachineUtil.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/DockerMachineUtil.js b/src/utils/DockerMachineUtil.js
index 98399d3c25..66bd39210e 100644
--- a/src/utils/DockerMachineUtil.js
+++ b/src/utils/DockerMachineUtil.js
@@ -156,7 +156,7 @@ var DockerMachine = {
       });
     } else {
       this.info().then(machine => {
-        var cmd = [resources.terminal(), `DOCKER_HOST=${machine.url} DOCKER_CERT_PATH=${path.join(util.home(), '.docker/machine/machines/' + machine.name)} DOCKER_TLS_VERIFY=1 $SHELL`];
+        var cmd = [resources.terminal(), `DOCKER_HOST=${machine.url} DOCKER_CERT_PATH=${path.join(util.home(), '.docker/machine/machines/' + machine.name)} DOCKER_TLS_VERIFY=1 /bin/bash`];
         util.exec(cmd).then(() => {});
       });
     }

From ee5ad39667b1b0f54f361e740090192782b06e02 Mon Sep 17 00:00:00 2001
From: TeckniX <lokitek@gmail.com>
Date: Wed, 27 May 2015 13:58:06 -0400
Subject: [PATCH 2/3] Patched warnings and random port assignment

Signed-off-by: TeckniX <lokitek@gmail.com>
---
 src/actions/ContainerActions.js               | 20 ++++++++++++-------
 .../ContainerDetailsSubheader.react.js        |  5 +++--
 src/utils/DockerMachineUtil.js                |  2 +-
 src/utils/DockerUtil.js                       |  2 ++
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/actions/ContainerActions.js b/src/actions/ContainerActions.js
index e5fd4e1dae..d3e5996d4e 100644
--- a/src/actions/ContainerActions.js
+++ b/src/actions/ContainerActions.js
@@ -2,10 +2,6 @@ import alt from '../alt';
 import dockerUtil from '../utils/DockerUtil';
 
 class ContainerActions {
-  start (name) {
-    this.dispatch({name});
-    dockerUtil.start(name);
-  }
 
   destroy (name) {
     this.dispatch({name});
@@ -17,14 +13,24 @@ class ContainerActions {
     dockerUtil.rename(name, newName);
   }
 
+  start (name) {
+    this.dispatch({name});
+    dockerUtil.start(name);
+  }
+
   stop (name) {
     this.dispatch({name});
     dockerUtil.stop(name);
   }
 
-  update (name, container) {
-    this.dispatch({name, container});
-    dockerUtil.updateContainer(name, container);
+  restart (name) {
+    this.dispatch({name});
+    dockerUtil.restart(name);
+  }
+
+  update (name, containerOpts) {
+    this.dispatch({name, containerOpts});
+    dockerUtil.updateContainer(name, containerOpts);
   }
 
   clearPending () {
diff --git a/src/components/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js
index 9b4cda575f..8ab707385d 100644
--- a/src/components/ContainerDetailsSubheader.react.js
+++ b/src/components/ContainerDetailsSubheader.react.js
@@ -83,7 +83,8 @@ var ContainerDetailsSubheader = React.createClass({
   handleRestart: function () {
     if (!this.disableRestart()) {
       metrics.track('Restarted Container');
-      dockerUtil.restart(this.props.container.Name);
+      //dockerUtil.restart(this.props.container.Name);
+      containerActions.restart(this.props.container.Name);
     }
   },
   handleStop: function () {
@@ -223,7 +224,7 @@ var ContainerDetailsSubheader = React.createClass({
             <div className="action-icon" onClick={this.handleRestart}><RetinaImage src="button-restart.png"/></div>
             <span className="btn-label restart">Restart</span>
           </div>
-          {{startStopToggle}}
+          {startStopToggle}
           <div className={terminalActionClass} onMouseEnter={this.handleItemMouseEnterTerminal} onMouseLeave={this.handleItemMouseLeaveTerminal}>
             <div className="action-icon" onClick={this.handleTerminal}><RetinaImage src="button-terminal.png"/></div>
             <span className="btn-label terminal">Terminal</span>
diff --git a/src/utils/DockerMachineUtil.js b/src/utils/DockerMachineUtil.js
index 66bd39210e..98399d3c25 100644
--- a/src/utils/DockerMachineUtil.js
+++ b/src/utils/DockerMachineUtil.js
@@ -156,7 +156,7 @@ var DockerMachine = {
       });
     } else {
       this.info().then(machine => {
-        var cmd = [resources.terminal(), `DOCKER_HOST=${machine.url} DOCKER_CERT_PATH=${path.join(util.home(), '.docker/machine/machines/' + machine.name)} DOCKER_TLS_VERIFY=1 /bin/bash`];
+        var cmd = [resources.terminal(), `DOCKER_HOST=${machine.url} DOCKER_CERT_PATH=${path.join(util.home(), '.docker/machine/machines/' + machine.name)} DOCKER_TLS_VERIFY=1 $SHELL`];
         util.exec(cmd).then(() => {});
       });
     }
diff --git a/src/utils/DockerUtil.js b/src/utils/DockerUtil.js
index 9a7e14c0ae..0ec52f089e 100644
--- a/src/utils/DockerUtil.js
+++ b/src/utils/DockerUtil.js
@@ -73,6 +73,8 @@ export default {
 
     if (containerData.NetworkSettings && containerData.NetworkSettings.Ports) {
       startopts.PortBindings = containerData.NetworkSettings.Ports;
+    } else if (containerData.HostConfig && containerData.HostConfig.PortBindings) {
+      startopts.PortBindings = containerData.HostConfig.PortBindings;
     } else {
       startopts.PublishAllPorts = true;
     }

From d0b674919377d56c4e858f6a7fc9312ef64e1144 Mon Sep 17 00:00:00 2001
From: TeckniX <lokitek@gmail.com>
Date: Wed, 27 May 2015 14:13:03 -0400
Subject: [PATCH 3/3] Removed old comment for dockerUtil restart

Signed-off-by: TeckniX <lokitek@gmail.com>
---
 src/components/ContainerDetailsSubheader.react.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js
index 8ab707385d..f5ee477cc7 100644
--- a/src/components/ContainerDetailsSubheader.react.js
+++ b/src/components/ContainerDetailsSubheader.react.js
@@ -83,7 +83,6 @@ var ContainerDetailsSubheader = React.createClass({
   handleRestart: function () {
     if (!this.disableRestart()) {
       metrics.track('Restarted Container');
-      //dockerUtil.restart(this.props.container.Name);
       containerActions.restart(this.props.container.Name);
     }
   },