Merge pull request #153 from jonseymour/150-deprecate-dockerport-flag

Deprecate support for --dockerport flag.

Author: Sven Dowideit

cmds.go

@@ -27,9 +27,13 @@ func cmdInit() int {
 		return 1
 	}
 
-	if ping(fmt.Sprintf("localhost:%d", B2D.DockerPort)) {
-		logf("--dockerport=%d on localhost is occupied. Please choose another one.", B2D.DockerPort)
-		return 1
+	if B2D.DockerPort > 0 {
+		// Reference Issue boot2docker-cli issue #150, docker issues #6247, #6271, #6327
+		logf("warning: VirtualBox (4.3.x) NAT port forwarding is currently unreliable. Prefer to use the host only interface if possible.")
+		if ping(fmt.Sprintf("localhost:%d", B2D.DockerPort)) {
+			logf("--dockerport=%d on localhost is occupied. Please choose another one.", B2D.DockerPort)
+			return 1
+		}
 	}
 
 	if ping(fmt.Sprintf("localhost:%d", B2D.SSHPort)) {
@@ -107,8 +111,10 @@ func cmdInit() int {
 	}
 
 	pfRules := map[string]vbx.PFRule{
-		"ssh":    {Proto: vbx.PFTCP, HostIP: net.ParseIP("127.0.0.1"), HostPort: B2D.SSHPort, GuestPort: 22},
-		"docker": {Proto: vbx.PFTCP, HostIP: net.ParseIP("127.0.0.1"), HostPort: B2D.DockerPort, GuestPort: dockerPort},
+		"ssh": {Proto: vbx.PFTCP, HostIP: net.ParseIP("127.0.0.1"), HostPort: B2D.SSHPort, GuestPort: 22},
+	}
+	if B2D.DockerPort > 0 {
+		pfRules["docker"] = vbx.PFRule{Proto: vbx.PFTCP, HostIP: net.ParseIP("127.0.0.1"), HostPort: B2D.DockerPort, GuestPort: dockerPort}
 	}
 
 	for name, rule := range pfRules {

config.go

@@ -134,7 +134,7 @@ func config() (*flag.FlagSet, error) {
 	flags.UintVarP(&B2D.DiskSize, "disksize", "s", 20000, "boot2docker disk image size (in MB).")
 	flags.UintVarP(&B2D.Memory, "memory", "m", 2048, "virtual machine memory size (in MB).")
 	flags.Uint16Var(&B2D.SSHPort, "sshport", 2022, "host SSH port (forward to port 22 in VM).")
-	flags.Uint16Var(&B2D.DockerPort, "dockerport", 2375, "host Docker port (forward to port 2375 in VM).")
+	flags.Uint16Var(&B2D.DockerPort, "dockerport", 0, "host Docker port (forward to port 2375 in VM). (deprecated - use with care)")
 	flags.IPVar(&B2D.HostIP, "hostip", net.ParseIP("192.168.59.3"), "VirtualBox host-only network IP address.")
 	flags.IPMaskVar(&B2D.NetMask, "netmask", flag.ParseIPv4Mask("255.255.255.0"), "VirtualBox host-only network mask.")
 	flags.BoolVar(&B2D.DHCPEnabled, "dhcp", true, "enable VirtualBox host-only network DHCP.")