hyperkit: split network option into 3

vpnkit mode has one or two arguments (eth socket and port control socket).

If splitting into only 2 then
    vpnkit,vpnkit-state/eth.sock,vpnkit-state/port.sock
becomes
    2: vpnkit
    1: vpnkit-state/eth.sock,vpnkit-state/port.sock
rather than
    0: vpnkit
    1: vpnkit-state/eth.sock
    2: vpnkit-state/port.sock
as desired.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-11-29 15:12:30 +00:00
parent 3cd02db567
commit 0d9de644b8

View File

@ -219,7 +219,7 @@ func runHyperKit(args []string) {
dflt := hyperkitNetworkingDefault dflt := hyperkitNetworkingDefault
networking = &dflt networking = &dflt
} }
netMode := strings.SplitN(*networking, ",", 2) netMode := strings.SplitN(*networking, ",", 3)
switch netMode[0] { switch netMode[0] {
case hyperkitNetworkingDockerForMac: case hyperkitNetworkingDockerForMac:
h.VPNKitSock = filepath.Join(os.Getenv("HOME"), "Library/Containers/com.docker.docker/Data/s50") h.VPNKitSock = filepath.Join(os.Getenv("HOME"), "Library/Containers/com.docker.docker/Data/s50")