docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into better-reports 

Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
This commit is contained in:
Jeffrey Morgan 2015-11-02 19:58:47 -08:00
parent 7b7f1d3870 3b09f1fe83
commit f9c9d94a1c
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/utils/DockerMachineUtil.js
View File

@ -24,11 +24,11 @@ var DockerMachine = {
version: function () { version: function () {
return util.exec([this.command(), '-v']).then(stdout => { return util.exec([this.command(), '-v']).then(stdout => {
try { try {
var match = stdout.match(/(\d+\.\d+\.\d+).*/); var matchlist = stdout.match(/(\d+\.\d+\.\d+).*/);
if (!match || match.length < 2) { if (!matchlist || matchlist.length < 2) {
Promise.reject('docker-machine -v output format not recognized.'); Promise.reject('docker-machine -v output format not recognized.');
} }
return Promise.resolve(match[1]); return Promise.resolve(matchlist[1]);
} catch (err) { } catch (err) {
return Promise.resolve(null); return Promise.resolve(null);
} }
@ -160,11 +160,13 @@ var DockerMachine = {
}, },
virtualBoxLogs: function (machineName = this.name()) { virtualBoxLogs: function (machineName = this.name()) {
let logsPath = path.join(util.home(), '.docker', 'machine', 'machines', machineName, machineName, 'Logs', 'VBox.log'); let logsPath = path.join(util.home(), '.docker', 'machine', 'machines', machineName, machineName, 'Logs', 'VBox.log');
if (fs.existsSync(logsPath)) { let logData = null;
return fs.readFileSync(logsPath, 'utf8'); try {
} else { logData = fs.readFileSync(logsPath, 'utf8');
return null; } catch (e) {
console.error(e);
} }
return logData;
} }
}; };

6
src/utils/VirtualBoxUtil.js
View File

@ -23,11 +23,11 @@ var VirtualBox = {
}, },
version: function () { version: function () {
return util.exec([this.command(), '-v']).then(stdout => { return util.exec([this.command(), '-v']).then(stdout => {
var match = stdout.match(/(\d+\.\d+\.\d+).*/); let matchlist = stdout.match(/(\d+\.\d+\.\d+).*/);
if (!match || match.length < 2) { if (!matchlist || matchlist.length < 2) {
Promise.reject('VBoxManage -v output format not recognized.'); Promise.reject('VBoxManage -v output format not recognized.');
} }
return Promise.resolve(match[1]); return Promise.resolve(matchlist[1]);
}).catch(() => { }).catch(() => {
return Promise.resolve(null); return Promise.resolve(null);
}); });