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

Merge pull request #2550 from dgageot/2479-warn-vbox-version 

FIX #2479 Warn on VirtualBox version
This commit is contained in:
Nathan LeClaire 2015-12-10 14:19:38 -08:00
parent a5eb979f09 42ad416c0a
commit 18372b13c3
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/drivers/virtualbox.md
View File

@ -11,7 +11,9 @@ parent="smn_machine_drivers"
# Oracle VirtualBox # Oracle VirtualBox
Create machines locally using [VirtualBox](https://www.virtualbox.org/). Create machines locally using [VirtualBox](https://www.virtualbox.org/).
This driver requires VirtualBox 4+ to be installed on your host. This driver requires VirtualBox 5+ to be installed on your host.
Using VirtualBox 4+ should work but will give you a warning. Older versions
will refuse to work.
$ docker-machine create --driver=virtualbox vbox-test $ docker-machine create --driver=virtualbox vbox-test

6
drivers/virtualbox/vbm.go
View File

@ -79,7 +79,11 @@ func (v *VBoxCmdManager) vbmOutErr(args ...string) (string, string, error) {
func checkVBoxManageVersion(version string) error { func checkVBoxManageVersion(version string) error {
if !strings.HasPrefix(version, "5.") && !strings.HasPrefix(version, "4.") { if !strings.HasPrefix(version, "5.") && !strings.HasPrefix(version, "4.") {
return fmt.Errorf("We support Virtualbox starting with version 4. Your VirtualBox install is %q. Please upgrade at https://www.virtualbox.org", version) return fmt.Errorf("We support Virtualbox starting with version 5. Your VirtualBox install is %q. Please upgrade at https://www.virtualbox.org", version)
}
if !strings.HasPrefix(version, "5.") {
log.Warnf("You are using version %s of VirtualBox. If you encouter issues, you might want to upgrade to version 5 at https://www.virtualbox.org", version)
} }
return nil return nil

4
drivers/virtualbox/vbm_test.go
View File

@ -30,8 +30,8 @@ func TestCheckVBoxManageVersionInvalid(t *testing.T) {
version string version string
expectedError string expectedError string
}{ }{
{"3.9", `We support Virtualbox starting with version 4. Your VirtualBox install is "3.9". Please upgrade at https://www.virtualbox.org`}, {"3.9", `We support Virtualbox starting with version 5. Your VirtualBox install is "3.9". Please upgrade at https://www.virtualbox.org`},
{"", `We support Virtualbox starting with version 4. Your VirtualBox install is "". Please upgrade at https://www.virtualbox.org`}, {"", `We support Virtualbox starting with version 5. Your VirtualBox install is "". Please upgrade at https://www.virtualbox.org`},
} }
for _, test := range tests { for _, test := range tests {

2
drivers/virtualbox/virtualbox.go
View File

@ -204,7 +204,7 @@ func (d *Driver) PreCreateCheck() error {
} }
// Check that VBoxManage is of a supported version // Check that VBoxManage is of a supported version
if err = checkVBoxManageVersion(version); err != nil { if err = checkVBoxManageVersion(strings.TrimSpace(version)); err != nil {
return err return err
} }