opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-18 11:42:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13798 from n1hility/fix-docker-sock

Browse Source 
Fix mac docker socket handling
This commit is contained in:
OpenShift Merge Robot
2022-04-07 07:17:35 -04:00
committed by GitHub
parent d7ff08aff4 356d534344
commit f838333b7e
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/machine/qemu/machine.go
View File

@ -1133,11 +1133,16 @@ func (v *MachineVM) setupAPIForwarding(cmd []string) ([]string, string, apiForwa
cmd = append(cmd, []string{"-forward-dest", destSock}...) cmd = append(cmd, []string{"-forward-dest", destSock}...)
cmd = append(cmd, []string{"-forward-user", forwardUser}...) cmd = append(cmd, []string{"-forward-user", forwardUser}...)
cmd = append(cmd, []string{"-forward-identity", v.IdentityPath}...) cmd = append(cmd, []string{"-forward-identity", v.IdentityPath}...)
link := socket.GetPath()
// The linking pattern is /var/run/docker.sock -> user global sock (link) -> machine sock (socket) // The linking pattern is /var/run/docker.sock -> user global sock (link) -> machine sock (socket)
// This allows the helper to only have to maintain one constant target to the user, which can be // This allows the helper to only have to maintain one constant target to the user, which can be
// repositioned without updating docker.sock. // repositioned without updating docker.sock.
link, err := v.userGlobalSocketLink()
if err != nil {
return cmd, socket.GetPath(), machineLocal
}
if !dockerClaimSupported() { if !dockerClaimSupported() {
return cmd, socket.GetPath(), claimUnsupported return cmd, socket.GetPath(), claimUnsupported
} }
@ -1176,6 +1181,16 @@ func (v *MachineVM) isIncompatible() bool {
return v.UID == -1 return v.UID == -1
} }
func (v *MachineVM) userGlobalSocketLink() (string, error) {
path, err := machine.GetDataDir(v.Name)
if err != nil {
logrus.Errorf("Resolving data dir: %s", err.Error())
return "", err
}
// User global socket is located in parent directory of machine dirs (one per user)
return filepath.Join(filepath.Dir(path), "podman.sock"), err
}
func (v *MachineVM) forwardSocketPath() (*MachineFile, error) { func (v *MachineVM) forwardSocketPath() (*MachineFile, error) {
sockName := "podman.sock" sockName := "podman.sock"
path, err := machine.GetDataDir(v.Name) path, err := machine.GetDataDir(v.Name)