From 165d463c690204dca3d82bef05bdc6371a5db371 Mon Sep 17 00:00:00 2001 From: TeckniX Date: Wed, 29 Apr 2015 17:26:09 -0400 Subject: [PATCH] Added support for env shell called via settings Signed-off-by: TeckniX --- src/components/ContainerDetailsSubheader.react.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js index fa5670e4f7..a62a943b6e 100644 --- a/src/components/ContainerDetailsSubheader.react.js +++ b/src/components/ContainerDetailsSubheader.react.js @@ -134,8 +134,12 @@ var ContainerDetailsSubheader = React.createClass({ metrics.track('Terminaled Into Container'); var container = this.props.container; var terminal = path.join(process.cwd(), 'resources', 'terminal'); + var shell = ContainerUtil.env(container).SHELL + if(typeof shell == "undefined") { + shell = 'sh'; + } machine.ip().then(ip => { - var cmd = [terminal, 'ssh', '-p', '22', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'LogLevel=quiet', '-o', 'StrictHostKeyChecking=no', '-i', '~/.docker/machine/machines/' + machine.name() + '/id_rsa', 'docker@' + ip, '-t', 'docker', 'exec', '-i', '-t', container.Name, 'sh']; + var cmd = [terminal, 'ssh', '-p', '22', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'LogLevel=quiet', '-o', 'StrictHostKeyChecking=no', '-i', '~/.docker/machine/machines/' + machine.name() + '/id_rsa', 'docker@' + ip, '-t', 'docker', 'exec', '-i', '-t', container.Name, shell]; exec(cmd, function (stderr, stdout, code) { if (code) { console.log(stderr);