Merge pull request #551 from TeckniX/patch-1

Random port mapping and warnings

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) {
+  restart (name) {
-    this.dispatch({name, container});
+    this.dispatch({name});
-    dockerUtil.updateContainer(name, container);
+    dockerUtil.restart(name);
+  }
+
+  update (name, containerOpts) {
+    this.dispatch({name, containerOpts});
+    dockerUtil.updateContainer(name, containerOpts);
   }
 
   clearPending () {

src/components/ContainerDetailsSubheader.react.js

@@ -83,7 +83,7 @@ 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);
     }
   },
   handleStop: function () {
@@ -223,7 +223,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>

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;
     }