Use magic path for ssh-agent on darwin.

fyne-io · Aug 26, 2023 · f350b61 · f350b61
1 parent 1065628
commit f350b61
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/internal/command/docker.go b/internal/command/docker.go
@@ -139,7 +139,12 @@ func (i *localContainerImage) cmd(vol volume.Volume, opts options, cmdArgs []str
 
 	// detect ssh-agent socket for private repositories access
 	if sshAuthSock := os.Getenv("SSH_AUTH_SOCK"); sshAuthSock != "" {
-		if realSshAuthSock, err := filepath.EvalSymlinks(sshAuthSock); err == nil {
+		if runtime.GOOS == "darwin" {
+			// on macOS, the SSH_AUTH_SOCK is not available in the container directly,
+			// but instead we need to the magic path "/run/host-services/ssh-auth.sock"
+			args = append(args, "-v", "/run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock")
+			args = append(args, "-e", "SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock")
+		} else if realSshAuthSock, err := filepath.EvalSymlinks(sshAuthSock); err == nil {
 			args = append(args, "-v", fmt.Sprintf("%s:/tmp/ssh-agent", realSshAuthSock))
 			args = append(args, "-e", "SSH_AUTH_SOCK=/tmp/ssh-agent")
 		}