Merge pull request #4 from jritsema/feature/container-tool

Add container-tool config option

Author: jritsema

AmazonQ.md

@@ -231,4 +231,4 @@ The output MCP JSON file would look like this.
 
 # Guidelines
 
-Before making any code changes, first checkout a new git branch.  After updating code, run `make build` to ensure that the code compiles. Then, after testing, git commit your changes with a concise short message on one line along with a longer summary message.
+Before making any code changes, first checkout a new git branch.  After updating code, run `make build` to ensure that the code compiles. Run `go fmt` to ensure your code is correctly formatted. Then, after testing your changes, git commit your changes with a concise short message on one line along with a longer summary message.

README.md

@@ -92,9 +92,9 @@ MCP CLI supports these predefined tool shortcuts for popular AI tools:
 - `claude-desktop` - Claude Desktop (`$HOME/Library/Application Support/Claude/claude_desktop_config.json`)
 - `cursor` - Cursor IDE (`$HOME/.cursor/mcp.json`)
 
-### Setting Default Tool
+### Setting Default AI Tool
 
-Configure a default tool to avoid specifying `-t` each time:
+Configure a default AI tool to avoid specifying `-t` each time:
 
 ```sh
 # Set Amazon Q CLI as your default tool
@@ -107,6 +107,15 @@ mcp set programming
 mcp set
 ```
 
+### Setting Container Tool
+
+If you're using containers to run your MCP servers (by setting the `image` property), then MCP CLI will output `docker` run commands by default. If you're using a different container tool such as `finch` or `podman`, etc., then you can use the `set container-tool` command.
+
+```sh
+# Set a custom container tool (default is docker)
+mcp config set container-tool finch
+```
+
 ### Profiles
 
 Organize your MCP servers with profiles using the `labels` field in your `mcp-compose.yml`:

cmd/config.go

@@ -11,7 +11,8 @@ import (
 
 // CLIConfig represents the structure of the MCP CLI config file
 type CLIConfig struct {
-	Tool string `json:"tool,omitempty"`
+	Tool          string `json:"tool,omitempty"`
+	ContainerTool string `json:"container-tool,omitempty"`
 }
 
 var configCmd = &cobra.Command{
@@ -29,7 +30,7 @@ var configSetCmd = &cobra.Command{
 		key := args[0]
 		value := args[1]
 
-		if key != "tool" {
+		if key != "tool" && key != "container-tool" {
 			fmt.Fprintf(os.Stderr, "Error: unsupported configuration key: %s\n", key)
 			os.Exit(1)
 		}
@@ -71,6 +72,8 @@ var configSetCmd = &cobra.Command{
 		switch key {
 		case "tool":
 			config.Tool = value
+		case "container-tool":
+			config.ContainerTool = value
 		}
 
 		// Write the updated config

cmd/list.go

@@ -1,8 +1,10 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 	"text/tabwriter"
 
@@ -104,9 +106,24 @@ func printServerRow(w *tabwriter.Writer, name string, service Service) {
 	if longFormat {
 		var commandStr string
 
+		// Get the container tool from config, default to "docker"
+		containerTool := "docker"
+		configDir := getConfigDir()
+		configPath := filepath.Join(configDir, "config.json")
+		
+		if _, err := os.Stat(configPath); err == nil {
+			data, err := os.ReadFile(configPath)
+			if err == nil {
+				var config CLIConfig
+				if err := json.Unmarshal(data, &config); err == nil && config.ContainerTool != "" {
+					containerTool = config.ContainerTool
+				}
+			}
+		}
+		
 		if service.Image != "" {
-			// For image-based servers, show the docker run command format
-			commandStr = fmt.Sprintf("docker run -i --rm")
+			// For image-based servers, show the container run command format
+			commandStr = fmt.Sprintf("%s run -i --rm", containerTool)
 
 			// Add environment variables to the command
 			for key := range service.Environment {

cmd/set.go

@@ -152,12 +152,27 @@ type MCPServer struct {
 func convertToMCPConfig(servers map[string]Service, envVars map[string]string) MCPConfig {
 	mcpServers := make(map[string]MCPServer)
 
+	// Get the container tool from config, default to "docker"
+	containerTool := "docker"
+	configDir := getConfigDir()
+	configPath := filepath.Join(configDir, "config.json")
+	
+	if _, err := os.Stat(configPath); err == nil {
+		data, err := os.ReadFile(configPath)
+		if err == nil {
+			var config CLIConfig
+			if err := json.Unmarshal(data, &config); err == nil && config.ContainerTool != "" {
+				containerTool = config.ContainerTool
+			}
+		}
+	}
+
 	for name, service := range servers {
 		var mcpServer MCPServer
 
 		if service.Image != "" {
-			// Docker container
-			mcpServer.Command = "docker"
+			// Container-based server
+			mcpServer.Command = containerTool
 			args := []string{"run", "-i", "--rm"}
 
 			// Add environment variables with expanded values