Merge remote-tracking branch 'origin/main' into enable-disable-tools

Author: Daniel-Kolev

.dockerignore

@@ -4,4 +4,6 @@
 !/go.mod
 !/go.sum
 !/.golangci.yml
-!/vendor
+!/vendor
+!/docs
+!/.git

.github/workflows/validate.yml

@@ -0,0 +1,53 @@
+name: validate
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+  pull_request:
+
+jobs:
+  prepare:
+    runs-on: ubuntu-24.04
+    outputs:
+      targets: ${{ steps.generate.outputs.targets }}
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v4
+      -
+        name: List targets
+        id: generate
+        uses: docker/bake-action/subaction/list-targets@v6
+        with:
+          target: validate-docs
+
+  validate:
+    runs-on: ubuntu-24.04
+    needs:
+      - prepare
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ${{ fromJson(needs.prepare.outputs.targets) }}
+    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          buildkitd-flags: --debug
+      -
+        name: Validate
+        uses: docker/bake-action@v6
+        with:
+          targets: ${{ matrix.target }}

Dockerfile

@@ -1,13 +1,52 @@
 #syntax=docker/dockerfile:1
 
-ARG GO_VERSION=1.24.4
+ARG GO_VERSION=1.24.5
+ARG DOCS_FORMATS="md,yaml"
 
 FROM --platform=${BUILDPLATFORM} golangci/golangci-lint:v2.1.6-alpine AS lint-base
 
 FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION}-alpine AS base
-RUN apk add --no-cache git
+RUN apk add --no-cache git rsync
 WORKDIR /app
 
+# Docs generation and validation targets
+FROM base AS docs-gen
+WORKDIR /src
+RUN --mount=target=. \
+    --mount=target=/root/.cache,type=cache \
+    go build -mod=vendor -o /out/docsgen ./docs/generator/generate.go
+
+FROM base AS docs-build
+COPY --from=docs-gen /out/docsgen /usr/bin
+ENV DOCKER_CLI_PLUGIN_ORIGINAL_CLI_COMMAND="mcp"
+ARG DOCS_FORMATS
+RUN --mount=target=/context \
+    --mount=target=.,type=tmpfs <<EOT
+  set -e
+  rsync -a /context/. .
+  docsgen --formats "$DOCS_FORMATS" --source "docs/generator/reference"
+  mkdir /out
+  cp -r docs/generator/reference/* /out/
+EOT
+
+FROM scratch AS docs-update
+COPY --from=docs-build /out /
+
+FROM docs-build AS docs-validate
+RUN --mount=target=/context \
+    --mount=target=.,type=tmpfs <<EOT
+  set -e
+  rsync -a /context/. .
+  git add -A
+  rm -rf docs/generator/reference/*
+  cp -rf /out/* ./docs/generator/reference/
+  if [ -n "$(git status --porcelain -- docs/generator/reference)" ]; then
+    echo >&2 'ERROR: Docs result differs. Rebase on main branch and rerun "make docs"'
+    git status --porcelain -- docs/generator/reference
+    exit 1
+  fi
+EOT
+
 FROM base AS lint
 COPY --from=lint-base /usr/bin/golangci-lint /usr/bin/golangci-lint
 ARG TARGETOS
@@ -76,19 +115,19 @@ COPY --from=packager-docker-mcp /out .
 
 
 # Build the mcp-gateway image
-FROM golang:1.24.4-alpine3.22@sha256:68932fa6d4d4059845c8f40ad7e654e626f3ebd3706eef7846f319293ab5cb7a AS build-mcp-gateway
+FROM golang:${GO_VERSION}-alpine AS build-mcp-gateway
 WORKDIR /app
 RUN --mount=type=cache,target=/root/.cache/go-build,id=mcp-gateway \
     --mount=source=.,target=. \
     go build -trimpath -ldflags "-s -w" -o / ./cmd/docker-mcp/
 
-FROM golang:1.24.4-alpine3.22@sha256:68932fa6d4d4059845c8f40ad7e654e626f3ebd3706eef7846f319293ab5cb7a AS build-mcp-bridge
+FROM golang:${GO_VERSION}-alpine AS build-mcp-bridge
 WORKDIR /app
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=source=./tools/docker-mcp-bridge,target=. \
     go build -trimpath -ldflags "-s -w" -o /docker-mcp-bridge .
 
-FROM alpine:3.22@sha256:8a1f59ffb675680d47db6337b49d22281a139e9d709335b492be023728e11715 AS mcp-gateway
+FROM alpine:3.22@sha256:4bcff63911fcb4448bd4fdacec207030997caf25e9bea4045fa6c8c44de311d1 AS mcp-gateway
 RUN apk add --no-cache docker-cli socat jq
 VOLUME /misc
 COPY --from=build-mcp-bridge /docker-mcp-bridge /misc/

Makefile

@@ -34,6 +34,13 @@ docker-mcp-cross:
 docker-mcp-%:
 	docker buildx build $(DOCKER_BUILD_ARGS) --target=package-docker-mcp --platform=$*/amd64,$*/arm64 -o ./dist .
 
+docs:
+	$(eval $@_TMP_OUT := $(shell mktemp -d -t mcp-cli-output.XXXXXXXXXX))
+	docker buildx bake --set "*.output=type=local,dest=$($@_TMP_OUT)" update-docs
+	rm -rf ./docs/generator/reference/*
+	cp -R "$($@_TMP_OUT)"/* ./docs/generator/reference/
+	rm -rf "$($@_TMP_OUT)"/*
+
 push-module-image:
 	cp -r dist ./module-image
 	docker buildx build --push --platform=linux/amd64,linux/arm64,darwin/amd64,darwin/arm64,windows/amd64,windows/arm64 --build-arg TAG=$(TAG) --tag=docker/docker-mcp-cli-desktop-module:$(TAG) ./module-image
@@ -70,4 +77,4 @@ push-l7proxy-image:
 push-dns-forwarder-image:
 	docker buildx bake dns-forwarder --push
 
-.PHONY: format lint clean docker-mcp-cross push-module-image mcp-package test docker-mcp push-mcp-gateway push-l4proxy-image push-l7proxy-image push-dns-forwarder-image
+.PHONY: format lint clean docker-mcp-cross push-module-image mcp-package test docker-mcp push-mcp-gateway push-l4proxy-image push-l7proxy-image push-dns-forwarder-image docs

README.md

@@ -51,7 +51,8 @@ The MCP cli will already be installed on recent versions of Docker Desktop but y
 ```bash
 # Clone the repository
 git clone https://github.com/docker/mcp-gateway.git
-cd docker-gateway
+cd mcp-gateway
+mkdir -p "$HOME/.docker/cli-plugins/"
 
 # Build and install the plugin
 make docker-mcp

cmd/docker-mcp/client/config.yml

@@ -44,6 +44,47 @@ system:
       list: '.mcpServers | to_entries | map(.value + {"name": .key})'
       set: .mcpServers[$NAME] = $JSON
       del: del(.mcpServers[$NAME])
+  gemini:
+    displayName: Gemini CLI
+    source: https://github.com/google-gemini/gemini-cli
+    icon: https://avatars.githubusercontent.com/u/161781182?s=120&v=4
+    installCheckPaths:
+    - $HOME/.gemini
+    - $USERPROFILE\.gemini
+    paths:
+      linux: $HOME/.gemini/settings.json
+      darwin: $HOME/.gemini/settings.json
+      windows: $USERPROFILE\.gemini\settings.json
+    yq:
+      list: '.mcpServers | to_entries | map(.value + {"name": .key})'
+      set: .mcpServers[$NAME] = $JSON
+      del: del(.mcpServers[$NAME])
+  goose:
+    displayName: Goose
+    source: https://github.com/block/goose
+    icon: https://raw.githubusercontent.com/docker/mcp-gateway/main/img/client/goose.png
+    installCheckPaths:
+    - $HOME/.config/goose
+    - $USERPROFILE\.config\goose
+    paths:
+      linux: $HOME/.config/goose/config.yaml
+      darwin: $HOME/.config/goose/config.yaml
+      windows: $USERPROFILE\.config\goose\config.yaml
+    yq:
+      list: '.extensions | to_entries | map(select(.value.bundled != true)) | map(.value + {"name": .key})'
+      set: '.extensions[$SIMPLE_NAME] = {
+        "args": $JSON.args,
+        "bundled": null,
+        "cmd": $JSON.command,
+        "description": "The Docker MCP Toolkit allows for easy configuration and consumption of MCP servers from the Docker MCP Catalog",
+        "enabled": true,
+        "env_keys": [],
+        "envs": {},
+        "name": $SIMPLE_NAME,
+        "timeout": 300,
+        "type": "stdio"
+      }'
+      del: del(.extensions[$SIMPLE_NAME])
   lmstudio:
     displayName: LM Studio
     source: https://lmstudio.ai/

cmd/docker-mcp/client/global.go

@@ -121,7 +121,7 @@ func (c *GlobalCfgProcessor) Update(key string, server *MCPServerSTDIO) error {
 
 func containsMCPDocker(in []MCPServerSTDIO) bool {
 	for _, server := range in {
-		if server.Name == DockerMCPCatalog {
+		if server.Name == DockerMCPCatalog || server.Name == makeSimpleName(DockerMCPCatalog) {
 			return true
 		}
 	}

cmd/docker-mcp/client/yq.go

@@ -5,6 +5,8 @@ import (
 	"errors"
 	"os"
 	"path/filepath"
+	"strings"
+	"unicode"
 
 	"github.com/mikefarah/yq/v4/pkg/yqlib"
 
@@ -62,6 +64,8 @@ func expandDelQuery(name string, key string) string {
 	switch name {
 	case "NAME":
 		return stringEscape(key)
+	case "SIMPLE_NAME":
+		return stringEscape(makeSimpleName(key))
 	default:
 		return ""
 	}
@@ -92,6 +96,8 @@ func expandSetQuery(name string, server MCPServerSTDIO) string {
 	switch name {
 	case "NAME":
 		return stringEscape(server.Name)
+	case "SIMPLE_NAME":
+		return stringEscape(makeSimpleName(server.Name))
 	case "JSON":
 		result, err := json.Marshal(temp)
 		if err != nil {
@@ -102,3 +108,13 @@ func expandSetQuery(name string, server MCPServerSTDIO) string {
 		return ""
 	}
 }
+
+func makeSimpleName(name string) string {
+	var b strings.Builder
+	for _, r := range name {
+		if unicode.IsLetter(r) {
+			b.WriteRune(unicode.ToLower(r))
+		}
+	}
+	return b.String()
+}

cmd/docker-mcp/commands/client.go

@@ -51,7 +51,7 @@ func connectClientCommand(cwd string, cfg client.Config) *cobra.Command {
 	}
 	cmd := &cobra.Command{
 		Use:   fmt.Sprintf("connect [OPTIONS] <mcp-client>\n\nSupported clients: %s", strings.Join(client.GetSupportedMCPClients(cfg), " ")),
-		Short: "Connect the Docker MCP Toolkit to a client",
+		Short: fmt.Sprintf("Connect the Docker MCP Toolkit to a client. Supported clients: %s", strings.Join(client.GetSupportedMCPClients(cfg), " ")),
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return client.Connect(cmd.Context(), cwd, cfg, args[0], opts.Global, opts.Quiet)
@@ -70,7 +70,7 @@ func disconnectClientCommand(cwd string, cfg client.Config) *cobra.Command {
 	}
 	cmd := &cobra.Command{
 		Use:   fmt.Sprintf("disconnect [OPTIONS] <mcp-client>\n\nSupported clients: %s", strings.Join(client.GetSupportedMCPClients(cfg), " ")),
-		Short: "Disconnect the Docker MCP Toolkit from a client",
+		Short: fmt.Sprintf("Disconnect the Docker MCP Toolkit from a client. Supported clients: %s", strings.Join(client.GetSupportedMCPClients(cfg), " ")),
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return client.Disconnect(cmd.Context(), cwd, cfg, args[0], opts.Global, opts.Quiet)
@@ -84,8 +84,9 @@ func disconnectClientCommand(cwd string, cfg client.Config) *cobra.Command {
 
 func manualClientCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:  "manual-instructions",
-		Args: cobra.NoArgs,
+		Use:   "manual-instructions",
+		Short: "Display the manual instructions to connect the MCP client",
+		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			printAsJSON, err := cmd.Flags().GetBool("json")
 			if err != nil {