Merge pull request #86 from doringeman/desktop-context

context: Detect DD based on the OS and allow WSL2 client

Author: doringeman

commands/root.go

@@ -66,7 +66,7 @@ func NewRootCmd(cli *command.DockerCli) *cobra.Command {
 
 			// Detect the model runner context and create a client for it.
 			var err error
-			modelRunner, err = desktop.DetectContext(dockerCLI)
+			modelRunner, err = desktop.DetectContext(cmd.Context(), dockerCLI)
 			if err != nil {
 				return fmt.Errorf("unable to detect model runner context: %w", err)
 			}

desktop/context.go

@@ -1,13 +1,15 @@
 package desktop
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
 	"os"
 	"runtime"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/context/docker"
@@ -18,11 +20,20 @@ import (
 
 // isDesktopContext returns true if the CLI instance points to a Docker Desktop
 // context and false otherwise.
-func isDesktopContext(cli *command.DockerCli) bool {
+func isDesktopContext(ctx context.Context, cli *command.DockerCli) bool {
+	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+	defer cancel()
+	serverInfo, _ := cli.Client().Info(ctx)
+
 	// We don't currently support Docker Model Runner in Docker Desktop for
 	// Linux, so we won't treat that as a Docker Desktop case (though it will
 	// still work as a standard Moby or Cloud case, depending on configuration).
 	if runtime.GOOS == "linux" {
+		if strings.Contains(serverInfo.KernelVersion, "-microsoft-standard-WSL2") {
+			// We can use Docker Desktop from within a WSL2 integrated distro.
+			// https://github.com/search?q=repo%3Amicrosoft%2FWSL2-Linux-Kernel+path%3A%2F%5Earch%5C%2F.*%5C%2Fconfigs%5C%2Fconfig-wsl%2F+CONFIG_LOCALVERSION&type=code
+			return true
+		}
 		return false
 	}
 
@@ -32,18 +43,8 @@ func isDesktopContext(cli *command.DockerCli) bool {
 		return false
 	}
 
-	// Otherwise used name-based heuristics to identify the environment.
-	name := cli.CurrentContext()
-	if name == "desktop-linux" {
-		return true
-	} else if name == "default" && os.Getenv("DOCKER_HOST") == "" {
-		return true
-	} else if runtime.GOOS == "windows" && name == "desktop-windows" {
-		// On Windows, we'll still target the Linux engine, even if the Windows
-		// engine is currently active.
-		return true
-	}
-	return false
+	// docker run -it --rm --privileged --pid=host justincormack/nsenter1 /bin/sh -c 'cat /etc/os-release'
+	return serverInfo.OperatingSystem == "Docker Desktop"
 }
 
 // isCloudContext returns true if the CLI instance points to a Docker Cloud
@@ -136,7 +137,7 @@ func NewContextForMock(client DockerHttpClient) *ModelRunnerContext {
 }
 
 // DetectContext determines the current Docker Model Runner context.
-func DetectContext(cli *command.DockerCli) (*ModelRunnerContext, error) {
+func DetectContext(ctx context.Context, cli *command.DockerCli) (*ModelRunnerContext, error) {
 	// Check for an explicit endpoint setting.
 	modelRunnerHost := os.Getenv("MODEL_RUNNER_HOST")
 
@@ -148,7 +149,7 @@ func DetectContext(cli *command.DockerCli) (*ModelRunnerContext, error) {
 	kind := ModelRunnerEngineKindMoby
 	if modelRunnerHost != "" {
 		kind = ModelRunnerEngineKindMobyManual
-	} else if isDesktopContext(cli) {
+	} else if isDesktopContext(ctx, cli) {
 		kind = ModelRunnerEngineKindDesktop
 		if treatDesktopAsMoby {
 			kind = ModelRunnerEngineKindMoby