From ad0d7e003ff4a886c9e8c0abcf274bc837bdc27c Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Sun, 13 Dec 2015 18:37:05 -0800
Subject: [PATCH] Fix bug where container would be run with bash even with a
 valid entrypoint

Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
---
 src/utils/DockerUtil.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/DockerUtil.js b/src/utils/DockerUtil.js
index f4227470c0..e30bc052d7 100644
--- a/src/utils/DockerUtil.js
+++ b/src/utils/DockerUtil.js
@@ -126,7 +126,7 @@ export default {
         return;
       }
 
-      containerData.Cmd = image.Config.Cmd || 'bash';
+      containerData.Cmd = image.Config.Cmd || image.Config.Entrypoint || 'bash';
       let existing = this.client.getContainer(name);
       existing.kill(() => {
         existing.remove(() => {