fix: use tmp dir for local socks

daytonaio · Mar 6, 2024 · bfb529a · bfb529a
1 parent 4790661
commit bfb529a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -7,19 +7,20 @@ import (
 	"path"
 	"provider/pkg/ssh_tunnel/util"
 	"provider/pkg/types"
+	"runtime"
 	"strings"
 
 	"github.com/docker/docker/client"
 
 	log "github.com/sirupsen/logrus"
 )
 
-func GetClient(targetOptions types.TargetOptions, pluginPath string) (*client.Client, error) {
+func GetClient(targetOptions types.TargetOptions) (*client.Client, error) {
 	if targetOptions.RemoteHostname == nil {
 		return getLocalClient()
 	}
 
-	return getRemoteClient(targetOptions, pluginPath)
+	return getRemoteClient(targetOptions)
 }
 
 func getLocalClient() (*client.Client, error) {
@@ -31,8 +32,8 @@ func getLocalClient() (*client.Client, error) {
 	return cli, nil
 }
 
-func getRemoteClient(targetOptions types.TargetOptions, pluginPath string) (*client.Client, error) {
-	localSockPath, err := forwardDockerSock(targetOptions, pluginPath)
+func getRemoteClient(targetOptions types.TargetOptions) (*client.Client, error) {
+	localSockPath, err := forwardDockerSock(targetOptions)
 	if err != nil {
 		return nil, err
 	}
@@ -45,8 +46,16 @@ func getRemoteClient(targetOptions types.TargetOptions, pluginPath string) (*cli
 	return cli, nil
 }
 
-func forwardDockerSock(targetOptions types.TargetOptions, pluginPath string) (string, error) {
-	localSockPath := path.Join(pluginPath, "target-socks", fmt.Sprintf("daytona-%s-docker.sock", strings.ReplaceAll(*targetOptions.RemoteHostname, ".", "-")))
+func forwardDockerSock(targetOptions types.TargetOptions) (string, error) {
+	tmpDir := "/tmp"
+	if runtime.GOOS == "windows" {
+		tmpDir = os.TempDir()
+		if tmpDir == "" {
+			return "", fmt.Errorf("could not determine temp dir")
+		}
+	}
+
+	localSockPath := path.Join(tmpDir, "target-socks", fmt.Sprintf("daytona-%s-docker.sock", strings.ReplaceAll(*targetOptions.RemoteHostname, ".", "-")))
 
 	if _, err := os.Stat(path.Dir(localSockPath)); err != nil {
 		err := os.MkdirAll(path.Dir(localSockPath), 0755)

diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go
@@ -321,5 +321,5 @@ func (p DockerProvider) getClient(targetOptionsJson string) (*docker_client.Clie
 		return nil, err
 	}
 
-	return client.GetClient(*targetOptions, *p.BasePath)
+	return client.GetClient(*targetOptions)
 }