Merge pull request #454 from docker/client/default-socket

feat: move to standalone daemon socket path

Author: joe0BAB

client/client.go

@@ -98,7 +98,7 @@ func New(options ...Option) (Client, error) {
 		}
 	}
 	if cfg.dialContext == nil {
-		cfg.dialContext = dialFromPath(api.DefaultSocketPath())
+		cfg.dialContext = dialFromPath(api.DaemonSocketPath())
 	}
 	c := &http.Client{
 		Transport: &http.Transport{

plugin/config.go

@@ -81,10 +81,10 @@ func newCfgForManualLaunch(p ExternalPlugin, opts ...ManualLaunchOption) (*cfg,
 		}
 	}
 	if cfg.conn == nil {
-		defaultSocketPath := api.DefaultSocketPath()
-		conn, err := net.Dial("unix", defaultSocketPath)
+		socketPath := api.DaemonSocketPath()
+		conn, err := net.Dial("unix", socketPath)
 		if err != nil {
-			return nil, fmt.Errorf("failed to connect to default socket %q: %w", defaultSocketPath, err)
+			return nil, fmt.Errorf("failed to connect to default socket %q: %w", socketPath, err)
 		}
 		hijackedConn, err := ipc.Hijackify(conn, hijackTimeout)
 		if err != nil {

plugin/config_test.go

@@ -43,7 +43,7 @@ func Test_newCfgForManualLaunch(t *testing.T) {
 				})
 				os.Args = []string{"test-plugin"}
 				t.Setenv("XDG_RUNTIME_DIR", os.TempDir())
-				socketPath := api.DefaultSocketPath()
+				socketPath := api.DaemonSocketPath()
 				os.Remove(socketPath)
 				require.NoError(t, os.MkdirAll(filepath.Dir(socketPath), 0o755))
 				listener, err := net.Listen("unix", socketPath)