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

vbox: fix panic with custom cidr 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-06-11 14:04:48 -04:00
parent effa03dad4
commit f26fb12664
No known key found for this signature in database
GPG Key ID: A519480096146526
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/virtualbox/virtualbox.go
View File

@ -27,7 +27,8 @@ import (
)
const (
isoFilename = "boot2docker.iso"
isoFilename = "boot2docker.iso"
defaultHostOnlyCIDR = "192.168.99.1/24"
)
var (
@ -96,7 +97,7 @@ func GetCreateFlags() []cli.Flag {
cli.StringFlag{
Name: "virtualbox-hostonly-cidr",
Usage: "Specify the Host Only CIDR",
Value: "192.168.99.1/24",
Value: defaultHostOnlyCIDR,
EnvVar: "VIRTUALBOX_HOSTONLY_CIDR",
},
}
@ -579,7 +580,18 @@ func (d *Driver) generateDiskImage(size int) error {
}
func (d *Driver) setupHostOnlyNetwork(machineName string) error {
ip, network, err := net.ParseCIDR(d.HostOnlyCIDR)
hostOnlyCIDR := d.HostOnlyCIDR
if hostOnlyCIDR == "" {
hostOnlyCIDR = defaultHostOnlyCIDR
}
ip, network, err := net.ParseCIDR(hostOnlyCIDR)
if err != nil {
return err
}
nAddr := network.IP.To4()
dhcpAddr, err := getRandomIPinSubnet(network.IP)