Make the MCP Gateway work out of the box with Docker CE

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

cmd/docker-mcp/command.go

@@ -58,9 +58,15 @@ func rootCommand(ctx context.Context, cwd string, dockerCli command.Cli) *cobra.
 				return err
 			}
 
-			// TODO(dga): We should also disable this check when running in Docker CE.
 			if os.Getenv("DOCKER_MCP_IN_CONTAINER") != "1" {
-				return desktop.CheckFeatureIsEnabled(ctx, "enableDockerMCPToolkit", "Docker MCP Toolkit")
+				runningInDockerCE, err := docker.RunningInDockerCE(ctx, dockerCli)
+				if err != nil {
+					return err
+				}
+
+				if !runningInDockerCE {
+					return desktop.CheckFeatureIsEnabled(ctx, "enableDockerMCPToolkit", "Docker MCP Toolkit")
+				}
 			}
 
 			return nil

cmd/docker-mcp/internal/docker/client.go

@@ -2,7 +2,9 @@ package docker
 
 import (
 	"context"
+	"fmt"
 	"io"
+	"runtime"
 	"sync"
 
 	"github.com/docker/cli/cli/command"
@@ -51,3 +53,16 @@ func NewClient(cli command.Cli) Client {
 		}),
 	}
 }
+
+func RunningInDockerCE(ctx context.Context, dockerCli command.Cli) (bool, error) {
+	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
+		return false, nil
+	}
+
+	info, err := dockerCli.Client().Info(ctx)
+	if err != nil {
+		return false, fmt.Errorf("failed to ping Docker daemon: %w", err)
+	}
+
+	return info.OperatingSystem != "Docker Desktop", nil
+}