docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-03 11:12:47 +03:00
Code Activity

Merge pull request #456 from TeckniX/master

Browse Source 
Added support for env shell called via settings
This commit is contained in:
Jeffrey Morgan
2015-04-29 17:51:18 -04:00
parent a4c061542e 165d463c69
commit 4c2e2e95de
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/ContainerDetailsSubheader.react.js
View File

@@ -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);