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

Merge pull request #1025 from jfieber/vboxnat 

Virtualbox: move NAT port allocation to machine boot
This commit is contained in:
Evan Hazlett 2015-04-29 09:25:38 -04:00
parent 193357a1ba f42177983f
commit 4358113b41
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/virtualbox/virtualbox.go
View File

@ -172,11 +172,6 @@ func (d *Driver) Create() error {
return err return err
} }
d.SSHPort, err = getAvailableTCPPort()
if err != nil {
return err
}
b2dutils := utils.NewB2dUtils("", "") b2dutils := utils.NewB2dUtils("", "")
if err := b2dutils.CopyIsoToMachineDir(d.Boot2DockerURL, d.MachineName); err != nil { if err := b2dutils.CopyIsoToMachineDir(d.Boot2DockerURL, d.MachineName); err != nil {
return err return err
@ -283,11 +278,6 @@ func (d *Driver) Create() error {
return err return err
} }
if err := vbm("modifyvm", d.MachineName,
"--natpf1", fmt.Sprintf("ssh,tcp,127.0.0.1,%d,,22", d.SSHPort)); err != nil {
return err
}
hostOnlyNetwork, err := getOrCreateHostOnlyNetwork( hostOnlyNetwork, err := getOrCreateHostOnlyNetwork(
net.ParseIP("192.168.99.1"), net.ParseIP("192.168.99.1"),
net.IPv4Mask(255, 255, 255, 0), net.IPv4Mask(255, 255, 255, 0),
@ -386,6 +376,10 @@ func (d *Driver) Start() error {
switch s { switch s {
case state.Stopped, state.Saved: case state.Stopped, state.Saved:
d.SSHPort, err = setPortForwarding(d.MachineName, 1, "ssh", "tcp", 22, d.SSHPort)
if err != nil {
return err
}
if err := vbm("startvm", d.MachineName, "--type", "headless"); err != nil { if err := vbm("startvm", d.MachineName, "--type", "headless"); err != nil {
return err return err
} }
@ -640,10 +634,11 @@ func zeroFill(w io.Writer, n int64) error {
return nil return nil
} }
func getAvailableTCPPort() (int, error) { // Select an available port, trying the specified
port := 0 // port first, falling back on an OS selected port.
func getAvailableTCPPort(port int) (int, error) {
for i := 0; i <= 10; i++ { for i := 0; i <= 10; i++ {
ln, err := net.Listen("tcp4", "127.0.0.1:0") ln, err := net.Listen("tcp4", fmt.Sprintf("127.0.0.1:%d", port))
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -658,8 +653,27 @@ func getAvailableTCPPort() (int, error) {
port = p port = p
return port, nil return port, nil
} }
port = 0 // Throw away the port hint before trying again
time.Sleep(1) time.Sleep(1)
} }
return 0, fmt.Errorf("unable to allocate tcp port") return 0, fmt.Errorf("unable to allocate tcp port")
}
// Setup a NAT port forwarding entry.
func setPortForwarding(machine string, interfaceNum int, mapName, protocol string, guestPort, desiredHostPort int) (int, error) {
actualHostPort, err := getAvailableTCPPort(desiredHostPort)
if err != nil {
return -1, err
}
if desiredHostPort != actualHostPort && desiredHostPort != 0 {
log.Debugf("NAT forwarding host port for guest port %d (%s) changed from %d to %d",
guestPort, mapName, desiredHostPort, actualHostPort)
}
cmd := fmt.Sprintf("--natpf%d", interfaceNum)
vbm("modifyvm", machine, cmd, "delete", mapName)
if err := vbm("modifyvm", machine,
cmd, fmt.Sprintf("%s,%s,127.0.0.1,%d,,%d", mapName, protocol, actualHostPort, guestPort)); err != nil {
return -1, err
}
return actualHostPort, nil
} }