Merge pull request #1340 from jeffdm/master

Fix bug where entry point would be repeated if no CMD was specified
docker · Jan 8, 2016 · 1807681 · 1807681
2 parents 9c94522 + 1b9a048
commit 1807681
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/utils/DockerUtil.js b/src/utils/DockerUtil.js
@@ -117,8 +117,13 @@ export default {
       if (!containerData.HostConfig || (containerData.HostConfig && !containerData.HostConfig.PortBindings)) {
         containerData.PublishAllPorts = true;
       }
+
+      if (image.Config.Cmd) {
+        containerData.Cmd = image.Config.Cmd;
+      } else if (!image.Config.Entrypoint) {
+        containerData.Cmd = 'bash';
+      }
 
-      containerData.Cmd = image.Config.Cmd || image.Config.Entrypoint || 'bash';
       let existing = this.client.getContainer(name);
       existing.kill(() => {
         existing.remove(() => {