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

Merge pull request #820 from kitematic/fix-vbox-5 

Fixed issues with Virtualbox 5
This commit is contained in:
Jeffrey Morgan 2015-07-15 13:40:24 -07:00
parent 53f74e6f56 53d08470b0
commit 81326fe8ad
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
__tests__/VirtualBoxUtil-test.js
View File

@ -3,10 +3,6 @@ var virtualBox = require('../src/utils/VirtualBoxUtil');
var util = require('../src/utils/Util'); var util = require('../src/utils/Util');
describe('VirtualBox', function () { describe('VirtualBox', function () {
it('returns the right command', function () {
expect(virtualBox.command()).toBe('/usr/bin/VBoxManage');
});
describe('version 4.3.20r96996', function () { describe('version 4.3.20r96996', function () {
pit('correctly parses virtualbox version', function () { pit('correctly parses virtualbox version', function () {
util.exec.mockImplementation(function () { util.exec.mockImplementation(function () {

10
package.json
View File

@ -26,11 +26,11 @@
"docker-machine-version": "0.3.0-rc2", "docker-machine-version": "0.3.0-rc2",
"docker-compose-version": "1.3.0", "docker-compose-version": "1.3.0",
"electron-version": "0.27.2", "electron-version": "0.27.2",
"virtualbox-version": "4.3.28", "virtualbox-version": "5.0.0",
"virtualbox-filename": "VirtualBox-4.3.28.pkg", "virtualbox-filename": "VirtualBox-5.0.0.pkg",
"virtualbox-filename-win": "VirtualBox-4.3.28.exe", "virtualbox-filename-win": "VirtualBox-5.0.0.exe",
"virtualbox-checksum": "60521caff652fc32ad733eee2eea27f03d0b4f7239af3bf4b21dc6f0251cf47a", "virtualbox-checksum": "9aa3746c508643cfd70093f484ac0a64e02438d740020e294d65a7fd409bdb3d",
"virtualbox-checksum-win": "82039b615bf18dfff92ac1d9a15b2cbd5c59c608631ccf77e2371d0fd67a6cf7", "virtualbox-checksum-win": "0ca898eb23e20506a28bf84514536ba5455cc6a35234ea096245e42ee113e617",
"dependencies": { "dependencies": {
"alt": "^0.16.2", "alt": "^0.16.2",
"ansi-to-html": "0.3.0", "ansi-to-html": "0.3.0",

4
src/utils/VirtualBoxUtil.js
View File

@ -7,7 +7,7 @@ var VirtualBox = {
if(util.isWindows()) { if(util.isWindows()) {
return 'C:\\Program Files\\Oracle\\VirtualBox\\VBoxManage.exe'; return 'C:\\Program Files\\Oracle\\VirtualBox\\VBoxManage.exe';
} else { } else {
return '/usr/bin/VBoxManage'; return '/Applications/VirtualBox.app/Contents/MacOS/VBoxManage';
} }
}, },
filename: function () { filename: function () {
@ -23,7 +23,7 @@ var VirtualBox = {
if(util.isWindows()) { if(util.isWindows()) {
return fs.existsSync('C:\\Program Files\\Oracle\\VirtualBox\\VBoxManage.exe') && fs.existsSync('C:\\Program Files\\Oracle\\VirtualBox\\VirtualBox.exe'); return fs.existsSync('C:\\Program Files\\Oracle\\VirtualBox\\VBoxManage.exe') && fs.existsSync('C:\\Program Files\\Oracle\\VirtualBox\\VirtualBox.exe');
} else { } else {
return fs.existsSync('/usr/bin/VBoxManage') && fs.existsSync('/Applications/VirtualBox.app') && fs.existsSync('/Applications/VirtualBox.app/Contents/MacOS/VBoxManage'); return fs.existsSync('/Applications/VirtualBox.app') && fs.existsSync('/Applications/VirtualBox.app/Contents/MacOS/VBoxManage');
} }
}, },
active: function () { active: function () {