Add back in registry options

Author: bobbyhouse

cmd/docker-mcp/commands/catalog_next.go

@@ -61,7 +61,7 @@ func createCatalogNextCommand() *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringArrayVar(&opts.Servers, "server", []string{}, "Server to include specified with a URI: docker:// (Docker Image reference), catalog:// (Catalog reference), or file:// (Local file path). Can be specified multiple times.")
+	flags.StringArrayVar(&opts.Servers, "server", []string{}, "Server to include specified with a URI: https:// (MCP Registry reference) or docker:// (Docker Image reference) or catalog:// (Catalog reference) or file:// (Local file path). Can be specified multiple times.")
 	flags.StringVar(&opts.FromWorkingSet, "from-profile", "", "Profile ID to create the catalog from")
 	flags.StringVar(&opts.FromLegacyCatalog, "from-legacy-catalog", "", "Legacy catalog URL to create the catalog from")
 	flags.StringVar(&opts.Title, "title", "", "Title of the catalog")

cmd/docker-mcp/commands/workingset.go

@@ -140,6 +140,7 @@ func createWorkingSetCommand(cfg *client.Config) *cobra.Command {
 		Long: `Create a new profile that groups multiple MCP servers together.
 A profile allows you to organize and manage related servers as a single unit.
 Profiles are decoupled from catalogs. Servers can be:
+  - MCP Registry references (e.g. http://registry.modelcontextprotocol.io/v0/servers/312e45a4-2216-4b21-b9a8-0f1a51425073)
   - OCI image references with docker:// prefix (e.g., "docker://my-server:latest"). Images must be self-describing.
   - Catalog references with catalog:// prefix (e.g., "catalog://mcp/docker-mcp-catalog/github+obsidian").
   - Local file references with file:// prefix (e.g., "file://./server.yaml").`,
@@ -149,6 +150,9 @@ Profiles are decoupled from catalogs. Servers can be:
   # Create a profile with multiple servers (OCI references)
   docker mcp profile create --name my-profile --server docker://my-server:latest --server docker://my-other-server:latest
 
+  # Create a profile with MCP Registry references
+  docker mcp profile create --name my-profile --server http://registry.modelcontextprotocol.io/v0/servers/71de5a2a-6cfb-4250-a196-f93080ecc860
+
   # Connect to clients upon creation
   docker mcp profile create --name dev-tools --connect cursor`,
 		Args: cobra.NoArgs,
@@ -166,7 +170,7 @@ Profiles are decoupled from catalogs. Servers can be:
 	flags := cmd.Flags()
 	flags.StringVar(&opts.Name, "name", "", "Name of the profile (required)")
 	flags.StringVar(&opts.ID, "id", "", "ID of the profile (defaults to a slugified version of the name)")
-	flags.StringArrayVar(&opts.Servers, "server", []string{}, "Server to include specified with a URI: docker:// (Docker Image reference), catalog:// (Catalog reference), or file:// (Local file path). Can be specified multiple times.")
+	flags.StringArrayVar(&opts.Servers, "server", []string{}, "Server to include specified with a URI: https:// (MCP Registry reference) or docker:// (Docker Image reference) or catalog:// (Catalog reference) or file:// (Local file path). Can be specified multiple times.")
 	flags.StringArrayVar(&opts.Connect, "connect", []string{}, fmt.Sprintf("Clients to connect to: mcp-client (can be specified multiple times). Supported clients: %s", client.GetSupportedMCPClients(*cfg)))
 	_ = cmd.MarkFlagRequired("name")
 
@@ -388,6 +392,9 @@ func addServerCommand() *cobra.Command {
   # Add servers with OCI references
   docker mcp profile server add my-profile --server docker://my-server:latest
 
+  # Add servers with MCP Registry references
+  docker mcp profile server add my-profile --server http://registry.modelcontextprotocol.io/v0/servers/71de5a2a-6cfb-4250-a196-f93080ecc860
+
   # Mix server references
   docker mcp profile server add dev-tools --server catalog://mcp/docker-mcp-catalog/github+obsidian --server docker://my-server:latest`,
 		Args: cobra.ExactArgs(1),
@@ -403,7 +410,7 @@ func addServerCommand() *cobra.Command {
 	}
 
 	flags := cmd.Flags()
-	flags.StringArrayVar(&servers, "server", []string{}, "Server to include specified with a URI: docker:// (Docker Image reference), catalog:// (Catalog reference), or file:// (Local file path). Can be specified multiple times.")
+	flags.StringArrayVar(&servers, "server", []string{}, "Server to include specified with a URI: https:// (MCP Registry reference) or docker:// (Docker Image reference) or catalog:// (Catalog reference) or file:// (Local file path). Can be specified multiple times.")
 
 	return cmd
 }

docs/profiles.md

@@ -10,6 +10,7 @@ A profile is a named collection of MCP servers that can be:
 - Used to quickly switch between different server configurations
 
 Profiles are decoupled from catalogs, meaning the servers in a profile can come from:
+- **MCP Registry references**: HTTP(S) URLs pointing to servers in the Model Context Protocol registry
 - **OCI image references**: Docker images with the `docker://` prefix
 - **Catalog references**: Servers from existing catalogs with the `catalog://` prefix
 - **Local file references**: Server definitions from local YAML or JSON files with the `file://` prefix (see [Server Entry Specification](./server-entry-spec.md) for file format details)
@@ -51,10 +52,16 @@ docker mcp profile create --name dev-tools \
 docker mcp profile create --name catalog-servers \
   --server catalog://mcp/docker-mcp-catalog/github+slack
 
-# Mix catalog and OCI references
+# Create with MCP Registry references
+docker mcp profile create --name registry-servers \
+  --server https://registry.modelcontextprotocol.io/v0/servers/71de5a2a-6cfb-4250-a196-f93080ecc860
+
+# Mix different methods of specifying servers
 docker mcp profile create --name mixed \
-  --server catalog://mcp/docker-mcp-catalog/github \
+  --server catalog://mcp/docker-mcp-catalog/dockerhub \
+  --server https://registry.modelcontextprotocol.io/v0/servers/71de5a2a-6cfb-4250-a196-f93080ecc860 \
   --server docker://my-server:latest
+  --server file://./my-server.yaml
 
 # Create with servers from local files
 docker mcp profile create --name local-servers \
@@ -70,10 +77,11 @@ docker mcp profile create --name "My Servers" --id my-servers \
 - `--name` is required and serves as the human-readable name
 - `--id` is optional; if not provided, it's generated from the name (lowercase, alphanumeric with hyphens)
 - `--server` can be specified multiple times to add multiple servers
-- Server references must use one of these prefixes:
-  - `docker://` for OCI images
-  - `catalog://` for catalog references
-  - `file://` for local YAML or JSON server definition files
+- Server references must be either:
+  - `docker://` prefix for OCI images
+  - `http://` or `https://` URLs for MCP Registry references
+  - `catalog://` prefix for catalog references
+  - `file://` prefix for local YAML or JSON server definition files
 
 ### Adding Servers to a Profile
 
@@ -89,6 +97,15 @@ docker mcp profile server add dev-tools \
 docker mcp profile server add dev-tools \
   --server catalog://mcp/docker-mcp-catalog/github+slack
 
+# Add servers with MCP Registry references
+docker mcp profile server add dev-tools \
+  --server https://registry.modelcontextprotocol.io/v0/servers/71de5a2a-6cfb-4250-a196-f93080ecc860
+
+# Mix MCP Registry references and OCI references
+docker mcp profile server add dev-tools \
+  --server https://registry.modelcontextprotocol.io/v0/servers/71de5a2a-6cfb-4250-a196-f93080ecc860 \
+  --server docker://my-server:latest
+
 # Add servers from local files
 docker mcp profile server add dev-tools \
   --server file://./my-server.yaml \
@@ -122,9 +139,9 @@ See the [Server Entry Specification](./server-entry-spec.md) for complete file f
 - Server references must start with:
   - `catalog://` for catalog references. This takes the form of `catalog://<catalog-oci-refence>/<server-1>+<server-2>`
   - `docker://` for OCI images
+  - `http://` or `https://` for MCP Registry URLs
   - `file://` for local YAML or JSON server definition files (see [Server Entry Specification](./server-entry-spec.md))
 - Catalog servers are referenced by their name within the catalog
-- File references should point to either a single server definition or a legacy catalog file with a `registry` map
 
 **Notes:**
 - You can add multiple servers in a single command
@@ -493,6 +510,8 @@ name: My Profile
 servers:
   - type: image
     image: mcp/github:latest
+  - type: registry
+    source: https://registry.modelcontextprotocol.io/v0/servers/71de5a2a-6cfb-4250-a196-f93080ecc860
     config:
       key: value
     secrets: default
@@ -514,7 +533,11 @@ secrets:
   "servers": [
     {
       "type": "image",
-      "image": "mcp/github:latest",
+      "image": "mcp/github:latest"
+    },
+    {
+      "type": "registry",
+      "source": "https://registry.modelcontextprotocol.io/v0/servers/71de5a2a-6cfb-4250-a196-f93080ecc860",
       "config": {
         "key": "value"
       },
@@ -536,8 +559,9 @@ secrets:
 - **id**: Unique identifier for the profile
 - **name**: Human-readable name
 - **servers**: Array of server definitions
-  - **type**: Currently only `image` is supported
-  - **image**: Docker image reference
+  - **type**: Either `image` or `registry`
+  - **image**: (For type `image`) Docker image reference
+  - **source**: (For type `registry`) MCP Registry URL
   - **config**: Optional configuration key-value pairs
   - **secrets**: Optional reference to a secrets configuration
   - **tools**: Optional list of specific tools to enable from this server
@@ -764,10 +788,11 @@ Error: unknown command "profile" for "docker mcp"
 Error: invalid server value: myserver
 ```
 
-**Solution**: Ensure server references use one of these prefixes:
-- `docker://` for images
-- `catalog://` for catalog references
-- `file://` for local server definition files
+**Solution**: Ensure server references use either:
+- `docker://` prefix for images
+- `http://` or `https://` for registry URLs
+- `catalog://` prefix for catalog references
+- `file://` prefix for local server definition files
 
 ### Conflicting Flags