github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3034 from justincormack/sock-rename

Browse Source 
Update to allow the new locations for Docker for Mac socket paths
This commit is contained in:
Rolf Neugebauer 2018-05-10 14:52:10 +01:00 committed by GitHub
commit 3bca52dc46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cmd/linuxkit/run_hyperkit.go
View File

@ -259,8 +259,22 @@ func runHyperKit(args []string) {
netMode := strings.SplitN(*networking, ",", 3)
switch netMode[0] {
case hyperkitNetworkingDockerForMac:
h.VPNKitSock = filepath.Join(os.Getenv("HOME"), "Library/Containers/com.docker.docker/Data/s50")
vpnkitPortSocket = filepath.Join(os.Getenv("HOME"), "Library/Containers/com.docker.docker/Data/s51")
oldEthSock := filepath.Join(os.Getenv("HOME"), "Library/Containers/com.docker.docker/Data/s50")
oldPortSock := filepath.Join(os.Getenv("HOME"), "Library/Containers/com.docker.docker/Data/s51")
newEthSock := filepath.Join(os.Getenv("HOME"), "Library/Containers/com.docker.docker/Data/vpnkit.eth.sock")
newPortSock := filepath.Join(os.Getenv("HOME"), "Library/Containers/com.docker.docker/Data/vpnkit.port.sock")
_, err := os.Stat(oldEthSock)
if err == nil {
h.VPNKitSock = oldEthSock
vpnkitPortSocket = oldPortSock
} else {
_, err = os.Stat(newEthSock)
if err != nil {
log.Fatalln("Cannot find Docker for Mac network sockets. Install Docker or use a different network mode.")
}
h.VPNKitSock = newEthSock
vpnkitPortSocket = newPortSock
}
case hyperkitNetworkingVPNKit:
if len(netMode) > 1 {
// Socket path specified, try to use existing VPNKit instance