Consume tools.yaml in gateway

Author: Daniel-Kolev

cmd/docker-mcp/commands/gateway.go

@@ -40,6 +40,7 @@ func gatewayCommand(docker docker.Client) *cobra.Command {
 			CatalogPath:  "docker-mcp.yaml",
 			RegistryPath: "registry.yaml",
 			ConfigPath:   "config.yaml",
+			ToolsPath:    "tools.yaml",
 			SecretsPath:  "docker-desktop",
 			Options: gateway.Options{
 				Cpus:         1,
@@ -65,6 +66,7 @@ func gatewayCommand(docker docker.Client) *cobra.Command {
 	runCmd.Flags().StringVar(&options.CatalogPath, "catalog", options.CatalogPath, "path to the docker-mcp.yaml catalog (absolute or relative to ~/.docker/mcp/catalogs/)")
 	runCmd.Flags().StringVar(&options.RegistryPath, "registry", options.RegistryPath, "path to the registry.yaml (absolute or relative to ~/.docker/mcp/)")
 	runCmd.Flags().StringVar(&options.ConfigPath, "config", options.ConfigPath, "path to the config.yaml (absolute or relative to ~/.docker/mcp/)")
+	runCmd.Flags().StringVar(&options.ToolsPath, "tools-config", options.ToolsPath, "path to the tools.yaml (absolute or relative to ~/.docker/mcp/)")
 	runCmd.Flags().StringVar(&options.SecretsPath, "secrets", options.SecretsPath, "colon separated paths to search for secrets. Can be `docker-desktop` or a path to a .env file (default to using Docker Deskop's secrets API)")
 	runCmd.Flags().StringSliceVar(&options.ToolNames, "tools", options.ToolNames, "List of tools to enable")
 	runCmd.Flags().StringArrayVar(&options.Interceptors, "interceptor", options.Interceptors, "List of interceptors to use (format: when:type:path, e.g. 'before:exec:/bin/path')")

cmd/docker-mcp/internal/gateway/capabilitites.go

@@ -7,6 +7,8 @@ import (
 	"strings"
 	"sync"
 
+	"slices"
+
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
 	"golang.org/x/sync/errgroup"
@@ -56,7 +58,7 @@ func (g *Gateway) listCapabilities(ctx context.Context, configuration Configurat
 					logf("  > Can't list tools %s: %s", serverConfig.Name, err)
 				} else {
 					for _, tool := range tools.Tools {
-						if !isToolEnabled(serverConfig.Name, serverConfig.Spec.Image, tool.Name, g.ToolNames) {
+						if !isToolEnabled(configuration, serverConfig.Name, serverConfig.Spec.Image, tool.Name, g.ToolNames) {
 							continue
 						}
 						capabilities.Tools = append(capabilities.Tools, server.ServerTool{
@@ -125,7 +127,7 @@ func (g *Gateway) listCapabilities(ctx context.Context, configuration Configurat
 			var capabilities Capabilities
 
 			for _, tool := range *toolGroup {
-				if !isToolEnabled(serverName, "", tool.Name, g.ToolNames) {
+				if !isToolEnabled(configuration, serverName, "", tool.Name, g.ToolNames) {
 					continue
 				}
 
@@ -193,9 +195,14 @@ func (c *Capabilities) PromptNames() []string {
 	return names
 }
 
-func isToolEnabled(serverName, serverImage, toolName string, enabledTools []string) bool {
+func isToolEnabled(configuration Configuration, serverName, serverImage, toolName string, enabledTools []string) bool {
 	if len(enabledTools) == 0 {
-		return true
+		tools, exists := configuration.tools.ServerTools[serverName]
+		if !exists {
+			return true
+		}
+
+		return slices.Contains(tools, toolName)
 	}
 
 	for _, enabled := range enabledTools {

cmd/docker-mcp/internal/gateway/config.go

@@ -6,6 +6,7 @@ type Config struct {
 	CatalogPath  string
 	ConfigPath   string
 	RegistryPath string
+	ToolsPath    string
 	SecretsPath  string
 }
 

cmd/docker-mcp/internal/gateway/configuration.go

@@ -25,6 +25,7 @@ type Configuration struct {
 	serverNames []string
 	servers     map[string]catalog.Server
 	config      map[string]map[string]any
+	tools       config.ToolsConfig
 	secrets     map[string]string
 }
 
@@ -97,6 +98,7 @@ type FileBasedConfiguration struct {
 	ServerNames  []string // Takes precedence over the RegistryPath
 	RegistryPath string
 	ConfigPath   string
+	ToolsPath    string
 	SecretsPath  string // Optional, if not set, use Docker Desktop's secrets API
 	Watch        bool
 
@@ -125,6 +127,11 @@ func (c *FileBasedConfiguration) Read(ctx context.Context) (Configuration, chan
 		return Configuration{}, nil, nil, err
 	}
 
+	toolsPath, err := config.FilePath(c.ToolsPath)
+	if err != nil {
+		return Configuration{}, nil, nil, err
+	}
+
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
 		return Configuration{}, nil, nil, err
@@ -175,6 +182,13 @@ func (c *FileBasedConfiguration) Read(ctx context.Context) (Configuration, chan
 			return Configuration{}, nil, nil, err
 		}
 	}
+	if toolsPath != "" {
+		log("- Watching tools at", toolsPath)
+		if err := watcher.Add(toolsPath); err != nil {
+			_ = watcher.Close()
+			return Configuration{}, nil, nil, err
+		}
+	}
 
 	return configuration, updates, watcher.Close, nil
 }
@@ -207,6 +221,11 @@ func (c *FileBasedConfiguration) readOnce(ctx context.Context) (Configuration, e
 		return Configuration{}, fmt.Errorf("reading config: %w", err)
 	}
 
+	serverToolsConfig, err := c.readToolsConfig(ctx)
+	if err != nil {
+		return Configuration{}, fmt.Errorf("reading tools: %w", err)
+	}
+
 	var secrets map[string]string
 	if c.SecretsPath == "docker-desktop" {
 		secrets, err = c.readDockerDesktopSecrets(ctx, servers, serverNames)
@@ -236,6 +255,7 @@ func (c *FileBasedConfiguration) readOnce(ctx context.Context) (Configuration, e
 		serverNames: serverNames,
 		servers:     servers,
 		config:      serversConfig,
+		tools:       serverToolsConfig,
 		secrets:     secrets,
 	}, nil
 }
@@ -283,6 +303,25 @@ func (c *FileBasedConfiguration) readConfig(ctx context.Context) (map[string]map
 	return cfg, nil
 }
 
+func (c *FileBasedConfiguration) readToolsConfig(ctx context.Context) (config.ToolsConfig, error) {
+	if c.ToolsPath == "" {
+		return config.ToolsConfig{}, nil
+	}
+
+	log("  - Reading tools from", c.ToolsPath)
+	yaml, err := config.ReadConfigFile(ctx, c.docker, c.ToolsPath)
+	if err != nil {
+		return config.ToolsConfig{}, fmt.Errorf("reading tools.yaml: %w", err)
+	}
+
+	cfg, err := config.ParseToolsConfig(yaml)
+	if err != nil {
+		return config.ToolsConfig{}, fmt.Errorf("parsing tools.yaml: %w", err)
+	}
+
+	return cfg, nil
+}
+
 func (c *FileBasedConfiguration) readDockerDesktopSecrets(ctx context.Context, servers map[string]catalog.Server, serverNames []string) (map[string]string, error) {
 	var secretNames []string
 	for _, serverName := range serverNames {

cmd/docker-mcp/internal/gateway/run.go

@@ -35,6 +35,7 @@ func NewGateway(config Config, docker docker.Client) *Gateway {
 			RegistryPath: config.RegistryPath,
 			ConfigPath:   config.ConfigPath,
 			SecretsPath:  config.SecretsPath,
+			ToolsPath:    config.ToolsPath,
 			Watch:        config.Watch,
 			docker:       docker,
 		},

examples/container/README.md

@@ -17,6 +17,7 @@ docker run -d \
     --catalog=/mcp/catalogs/docker-mcp.yaml \
     --config=/mcp/config.yaml \
     --registry=/mcp/registry.yaml \
+    --tools-config=/mcp/tools.yaml \
     --secrets=docker-desktop \
     --watch=true \
     --transport=sse \

examples/mcp_toolkit/compose.yaml

@@ -10,6 +10,7 @@ services:
       - --catalog=/mcp/catalogs/docker-mcp.yaml
       - --config=/mcp/config.yaml
       - --registry=/mcp/registry.yaml
+      - --tools-config=/mcp/tools.yaml
       - --secrets=docker-desktop
       - --watch=true
       - --transport=sse