centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 22:38:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1710 from docker/fix-exec

Browse Source 
Fixed container exec
This commit is contained in:
French Ben
2016-05-27 14:36:23 -07:00
parent 745cfa0537 de88688cab
commit 16947449a7
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/utils/DockerMachineUtil.js
View File

@@ -147,29 +147,33 @@ var DockerMachine = {
});
},
dockerTerminal: function (cmd, machineName = this.name()) {
cmd = cmd || process.env.SHELL || '';
if (util.isWindows()) {
cmd = cmd || '';
this.url(machineName).then(machineUrl => {
util.exec('start powershell.exe ' + cmd,
{env: {
'DOCKER_HOST': machineUrl,
'DOCKER_CERT_PATH': path.join(util.home(), '.docker', 'machine', 'machines', machineName),
'DOCKER_TLS_VERIFY': 1
}
if (util.isNative()) {
util.exec('start powershell.exe ' + cmd);
} else {
this.url(machineName).then(machineUrl => {
util.exec('start powershell.exe ' + cmd,
{env: {
'DOCKER_HOST': machineUrl,
'DOCKER_CERT_PATH': path.join(util.home(), '.docker', 'machine', 'machines', machineName),
'DOCKER_TLS_VERIFY': 1
}
});
});
});
} else if (util.isNative()) {
cmd = cmd || process.env.SHELL;
var terminal = util.isLinux() ? util.linuxTerminal() : [path.join(process.env.RESOURCES_PATH, 'terminal')];
terminal.push(cmd);
if (terminal) {
util.execFile(terminal).then(() => {});
}
} else {
cmd = cmd || process.env.SHELL;
this.url(machineName).then(machineUrl => {
util.execFile([path.join(process.env.RESOURCES_PATH, 'terminal'), `DOCKER_HOST=${machineUrl} DOCKER_CERT_PATH=${path.join(util.home(), '.docker/machine/machines/' + machineName)} DOCKER_TLS_VERIFY=1 ${cmd}`]).then(() => {});
});
var terminal = util.isLinux() ? util.linuxTerminal() : [path.join(process.env.RESOURCES_PATH, 'terminal')];
if (util.isNative()) {
terminal.push(cmd);
util.execFile(terminal).then(() => {});
} else {
this.url(machineName).then(machineUrl => {
terminal.push(`DOCKER_HOST=${machineUrl} DOCKER_CERT_PATH=${path.join(util.home(), '.docker/machine/machines/' + machineName)} DOCKER_TLS_VERIFY=1`);
terminal.push(cmd);
util.execFile(terminal).then(() => {});
});
}
}
},
virtualBoxLogs: function (machineName = this.name()) {