Skip to content

Commit 4653c10

Browse files
authored
Merge branch 'main' into ENGDOCS-2893-containerd
2 parents 15c8c0d + 170ae6d commit 4653c10

File tree

41 files changed

+414
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+414
-192
lines changed

.vale.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,19 @@ Docker.Capitalization = NO
1313
Vale.Spelling = NO
1414
Vale.Terms = NO
1515
Docker.Capitalization = NO
16+
Docker.We = NO
17+
18+
[content/manuals/build/buildkit/dockerfile-release-notes.md]
19+
Vale.Spelling = NO
20+
Vale.Terms = NO
21+
Docker.Capitalization = NO
22+
Docker.We = NO
23+
24+
[content/manuals/*/release-notes.md]
25+
Vale.Spelling = NO
26+
Vale.Terms = NO
27+
Docker.Capitalization = NO
28+
Docker.We = NO
1629

1730
[content/contribute/*.md]
1831
Vale.Spelling = NO

.vscode/docker.code-snippets

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,9 @@
7777
],
7878
"description": "Insert a frontmatter block with title, weight, description, keywords, and aliases."
7979
}
80+
"Insert Visual Studio Code": {
81+
"prefix": ["vscode", "vs"],
82+
"body": ["Visual Studio Code"],
83+
"description": "Insert 'Visual Studio Code'",
84+
},
8085
}

_vale/config/vocabularies/Docker/accept.txt

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
(?i)[A-Z]{2,}'?s
22

3+
[Dd]ev
34
Adreno
45
Aleksandrov
56
Amazon
@@ -14,14 +15,17 @@ bootup
1415
Btrfs
1516
Bugsnag
1617
BuildKit
18+
buildkitd
1719
BusyBox
20+
CD
1821
CentOS
1922
Ceph
2023
cgroup
2124
Chrome
2225
Chrome DevTools
23-
Citrix
26+
CI
2427
CI/CD
28+
Citrix
2529
cli
2630
CLI
2731
CloudFront
@@ -39,7 +43,6 @@ denylist
3943
deprovisioning
4044
deserialization
4145
deserialize
42-
[Dd]ev
4346
Dev Environments?
4447
Dex
4548
displayName
@@ -59,6 +62,7 @@ Docker's
5962
Dockerfile
6063
dockerignore
6164
Dockerize
65+
Dockerized
6266
Dockerizing
6367
Entra
6468
EPERM
@@ -129,6 +133,7 @@ netfilter
129133
netlabel
130134
netlink
131135
Netplan
136+
Neovim
132137
NFSv\d
133138
Nginx
134139
npm
@@ -142,9 +147,11 @@ osquery
142147
osxfs
143148
OTel
144149
Paketo
150+
PAT
151+
perl
145152
pgAdmin
146-
plist
147153
PKG
154+
plist
148155
Postgres
149156
PowerShell
150157
Python
@@ -173,8 +180,8 @@ subvolume
173180
Syft
174181
syntaxes
175182
Sysbox
176-
sysctls
177183
sysctl
184+
sysctls
178185
Sysdig
179186
systemd
180187
Testcontainers
@@ -184,17 +191,15 @@ Trivy
184191
Trixie
185192
Ubuntu
186193
ufw
187-
ui
188-
uid
189194
umask
190195
uncaptured
191196
Uncaptured
192197
undeterminable
193198
Unix
194199
unmanaged
200+
Visual Studio Code
195201
VMware
196202
vpnkit
197-
VSCode
198203
vSphere
199204
Vue
200205
Wasm
@@ -203,6 +208,7 @@ Windows
203208
windowsfilter
204209
WireMock
205210
workdir
211+
WORKDIR
206212
Xdebug
207213
youki
208214
Yubikey
@@ -219,6 +225,8 @@ Zsh
219225
[Cc]odenames?
220226
[Cc]ompose
221227
[Cc]onfigs
228+
[dD]eduplicate
229+
[Dd]ev
222230
[Dd]istroless
223231
[Ff]ilepaths?
224232
[Ff]iletypes?

_vendor/github.com/docker/buildx/docs/bake-stdlib.md

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# github.com/moby/moby v28.3.3+incompatible
22
# github.com/moby/buildkit v0.23.2
3-
# github.com/docker/buildx v0.26.1
3+
# github.com/docker/buildx v0.27.0
44
# github.com/docker/cli v28.3.3+incompatible
55
# github.com/docker/compose/v2 v2.39.2
66
# github.com/docker/model-cli v0.1.33-0.20250703103301-d4e4936a9eb2

assets/css/components.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,13 @@
7777
align-items: center;
7878
justify-content: center;
7979
}
80+
.admonition p{
81+
margin-bottom: 1em;
82+
}
83+
.admonition ul{
84+
@apply list-disc pl-5 mb-1;
85+
}
86+
8087

8188
.download-links {
8289
@apply block;
@@ -93,6 +100,7 @@
93100
.card-image {
94101
@apply h-12 w-12 overflow-hidden;
95102
}
103+
96104
}
97105
.button {
98106
@apply my-2 mr-2 inline-block rounded-sm bg-blue-500 p-1 px-3 text-white hover:bg-blue-600 dark:bg-blue-500 hover:dark:bg-blue-400;

content/manuals/ai/gordon/mcp/built-in-tools.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,6 @@ General-purpose development utilities.
225225
| `run_model` | Query a model with a prompt |
226226
| `remove_model` | Remove a Docker model |
227227

228-
### Docker MCP catalog
229-
230-
If you enable the [MCP Toolkit feature](../../mcp-catalog-and-toolkit/_index.md),
231-
all the tools you enable and configure are available for Gordon to use.
232-
233-
|----------------|----------------------------------|
234-
| `list_models` | List all available Docker models |
235-
| `pull_model` | Download an Docker model |
236-
| `run_model` | Query a model with a prompt |
237-
| `remove_model` | Remove an Docker model |
238-
239228
### Docker MCP Catalog
240229

241230
If you have enabled the [MCP Toolkit feature](../../mcp-catalog-and-toolkit/_index.md),

content/manuals/ai/mcp-catalog-and-toolkit/_index.md

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,17 @@ grid:
2121
link: /ai/mcp-catalog-and-toolkit/toolkit/
2222
---
2323

24-
The Model Context Protocol (MCP) is a modern standard that transforms AI agents
25-
from passive responders into action-oriented systems. By standardizing how tools
26-
are described, discovered, and invoked, MCP enables agents to securely query
27-
APIs, access data, and run services across different environments.
28-
29-
As agents move into production, MCP solves common integration challenges —
30-
interoperability, reliability, and security — by providing a consistent,
31-
decoupled, and scalable interface between agents and tools. Just as containers
32-
redefined software deployment, MCP is reshaping how AI systems interact with the
33-
world.
34-
35-
> **Example**
36-
>
37-
> In simple terms, an MCP server is a way for an LLM to interact with an external system.
38-
>
39-
> For example:
40-
> If you ask a model to create a meeting, it needs to communicate with your calendar app to do that.
41-
> An MCP server for your calendar app provides _tools_ that perform atomic actions, such as:
42-
> "getting the details of a meeting" or "creating a new meeting".
43-
44-
## What is Docker MCP Catalog and Toolkit?
24+
{{< summary-bar feature_name="Docker MCP Catalog and Toolkit" >}}
4525

4626
Docker MCP Catalog and Toolkit is a solution for securely building, sharing, and
47-
running MCP tools. It simplifies the developer experience across these areas:
27+
running MCP tools.
28+
29+
It simplifies the developer experience across these areas:
4830

4931
- Discovery: A central catalog with verified, versioned tools.
5032
- Credential management: OAuth-based and secure by default.
5133
- Execution: Tools run in isolated, containerized environments.
52-
- Portability: Use MCP tools across Claude, Cursor, VS Code, and more—no code
34+
- Portability: Use MCP tools across Claude, Cursor, Visual Studio Code, and more—no code
5335
changes needed.
5436

5537
With Docker Hub and the MCP Toolkit, you can:
@@ -58,4 +40,24 @@ With Docker Hub and the MCP Toolkit, you can:
5840
- Add tools using the CLI or GUI.
5941
- Rely on Docker's pull-based infrastructure for trusted delivery.
6042

43+
## MCP servers
44+
45+
MCP servers are systems that use the [Model Context Protocol](https://www.anthropic.com/news/model-context-protocol) (MCP) to help manage
46+
and run AI or machine learning models more efficiently. MCP allows different
47+
parts of a system, like the model, data, and runtime environment, to
48+
communicate in a standardized way. You can see them as
49+
add-ons that provide specific tools to an LLM.
50+
51+
> [!TIP]
52+
> Example:
53+
> If you ask a model to create a meeting, it needs to communicate with your calendar app to do that.
54+
>
55+
> An MCP server provided by your calendar app provides _tools_ to your model to perform atomic
56+
> actions, like:
57+
>
58+
> - `get the details of a meeting`
59+
> - `create a new meeting`
60+
> - ...
61+
62+
6163
{{< grid >}}

content/manuals/ai/mcp-catalog-and-toolkit/catalog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
---
22
title: Docker MCP Catalog
3+
linkTitle: MCP Catalog
34
description: Learn about the benefits of the MCP Catalog, how you can use it, and how you can contribute
45
keywords: docker hub, mcp, mcp servers, ai agents, catalog, docker
6+
weight: 10
57
---
68

9+
{{< summary-bar feature_name="Docker MCP Catalog" >}}
10+
711
The [Docker MCP Catalog](https://hub.docker.com/mcp) is a centralized, trusted
812
registry for discovering, sharing, and running MCP-compatible tools. Integrated
913
with Docker Hub, it offers verified, versioned, and curated MCP servers

0 commit comments

Comments
 (0)