docker · ArthurFlag · Jul 9, 2025 · Jul 9, 2025 · Jul 9, 2025 · Jul 9, 2025
diff --git a/assets/css/components.css b/assets/css/components.css
@@ -95,7 +95,7 @@
   }
 }
 .button {
-  @apply mt-1 inline-block rounded-sm bg-blue-500 p-1 px-3 text-blue-50 text-white hover:bg-blue-600 dark:bg-blue-500 hover:dark:bg-blue-400;
+  @apply my-2 mr-2 inline-block rounded-sm bg-blue-500 p-1 px-3 text-blue-50 text-white hover:bg-blue-600 dark:bg-blue-500 hover:dark:bg-blue-400;
 }
 
 .summary-bar {

diff --git a/content/includes/gordondhi.md b/content/includes/gordondhi.md
@@ -0,0 +1,28 @@
+1. Ensure Gordon is [enabled](/manuals/ai/gordon.md#enable-ask-gordon).
+1. In Gordon's Toolbox, ensure Gordon's [Developer MCP toolkit is enabled](/manuals/ai/gordon/mcp/built-in-tools.md#configuration).
+1. In the terminal, navigate to the directory containing your Dockerfile.
+1. Start a conversation with Gordon:
+   ```bash
+   docker ai
+   ```
+1. Type:
+   ```console
+   "Migrate my dockerfile to DHI"
+   ```
+1. Follow the conversation with Gordon. Gordon will edit your Dockerfile, so when
+   it requests access to the filesystem and more, type `yes` to allow Gordon to proceed.
+
+   > [!NOTE]
+   > To learn more about Gordon's data retention and the data it
+   > can access, see [Gordon](/manuals/ai/gordon.md#what-data-does-gordon-access).
+
+When the migration is complete, you see a success message:
+
+```text
+The migration to Docker Hardened Images (DHI) is complete. The updated Dockerfile
+successfully builds the image, and no vulnerabilities were detected in the final image.
+The functionality and optimizations of the original Dockerfile have been preserved.
+```
+
+> [!IMPORTANT]
+> As with any AI tool, you must verify Gordon's edits and test your image.
diff --git a/content/manuals/_index.md b/content/manuals/_index.md
@@ -31,6 +31,11 @@ params:
     description: Run containers programmatically in your preferred programming language.
     icon: /icons/Testcontainers.svg
     link: /testcontainers/
+  - title: MCP Gateway
+    description: Manage and secure your AI tools with a single gateway.
+    icon: /icons/toolkit.svg
+    link: /ai/mcp-gateway/
+
   ai:
   - title: Ask Gordon
     description: Streamline your workflow and get the most out of the Docker ecosystem with your personal AI assistant.

diff --git a/content/manuals/ai/gordon/_index.md b/content/manuals/ai/gordon/_index.md
@@ -20,12 +20,13 @@
 
 ## Key features
 
-Ask Gordon provides AI-powered assistance within Docker tools. It can:
+Ask Gordon provides AI-powered assistance in Docker tools. It can:
 
 - Improve Dockerfiles
 - Run and troubleshoot containers
 - Interact with your images and code
 - Find vulnerabilities or configuration issues
+- Migrate a Dockerfile to use [Docker Hardened Images](/manuals/dhi/_index.md)
 
 It understands your local environment, including source code, Dockerfiles, and
 images, to provide personalized and actionable guidance.
@@ -104,9 +105,10 @@
 
 ## Using Ask Gordon
 
-The primary interfaces to Docker's AI capabilities are through the **Ask
-Gordon** view in Docker Desktop, or if you prefer to use the CLI: the `docker
-ai` CLI command.
+You can access Gordon:
+
+- In Docker Desktop, in the **Ask Gordon** view.
+- Via the Docker CLI, with the `docker ai` CLI command.
 
 Once you've enabled the Docker AI features, you'll also find references to **Ask
 Gordon** in various other places throughout the Docker Desktop user interface.
@@ -122,6 +124,7 @@
 - [Troubleshoot a crashed container](#troubleshoot-a-crashed-container)
 - [Get help with running a container](#get-help-with-running-a-container)
 - [Improve a Dockerfile](#improve-a-dockerfile)
+- [Migrate a Dockerfile to DHI](#migrate-a-dockerfile-to-dhi)
 
 For more examples, try asking Gordon directly. For example:
 
@@ -197,6 +200,17 @@
 - Portability
 - Resource efficiency
 
+### Migrate a Dockerfile to DHI
+
+Migrating your Dockerfile to use [Docker Hardened Images](/manuals/dhi/_index.md) helps you build
+more secure, minimal, and production-ready containers. DHIs are designed to
+reduce vulnerabilities, enforce best practices, and simplify compliance, making
+them a strong foundation for secure software supply chains.
+
+To request Gordon's help for the migration:
+
+{{% include "gordondhi.md" %}}
+
 ## Disable Ask Gordon
 
 ### For individual users

diff --git a/content/manuals/ai/mcp-catalog-and-toolkit/hub-mcp.md b/content/manuals/ai/mcp-catalog-and-toolkit/hub-mcp.md
@@ -29,13 +29,13 @@
 > which means Gordon can automatically interact with your MCP servers.
 
 ## Using other clients
-If want to integrate the Docker Hub MCP Server into your own development environment, you can find the source code and installation instructions on our [GitHub repository](https://github.com/docker/hub-mcp). 
+If want to integrate the Docker Hub MCP Server into your own development environment, you can find the source code and installation instructions on our [GitHub repository](https://github.com/docker/hub-mcp).
 
 ## Use Claude Desktop as a client
 
 1. Add the Docker Hub MCP Server configuration to your `claude_desktop_config.json`:
 
-### For public repositories only:
+### For public repositories only
 
    - `/FULL/PATH/TO/YOUR/docker-hub-mcp-server` - The complete path to where you cloned this repository
 ```json
@@ -48,11 +48,13 @@
   }
 }
 ```
-### For authenticated access (recommended):
+
+### For authenticated access
+
  Replace the following values:
    - `YOUR_DOCKER_HUB_USERNAME` - Your Docker Hub username
    - `YOUR_DOCKER_HUB_PERSONAL_ACCESS_TOKEN` - Your Docker Hub Personal Access Token
-  - `/FULL/PATH/TO/YOUR/docker-hub-mcp-server` - The complete path to where you cloned this 
+  - `/FULL/PATH/TO/YOUR/docker-hub-mcp-server` - The complete path to where you cloned this
 
 ```json
 {
@@ -67,12 +69,15 @@
   }
 }
 ```
-2. Save the configuration file and completely restart Claude Desktop for the changes to take effect.
+
+1. Save the configuration file and completely restart Claude Desktop for the changes to take effect.
 
 ## Usage with VS Code
+
 1. Add the Docker Hub MCP Server configuration to your User Settings (JSON) file in VS Code. You can do this by opening the `Command Palette` and typing `Preferences: Open User Settings (JSON)`.
 
-### For public repositories only:
+### For public repositories only
+
 
    - `/FULL/PATH/TO/YOUR/docker-hub-mcp-server` - The complete path to where you cloned this repository
 ```json
@@ -85,11 +90,13 @@
   }
 }
 ```
-### For authenticated access (recommended):
+
+### For authenticated access
+
  Replace the following values:
    - `YOUR_DOCKER_HUB_USERNAME` - Your Docker Hub username
    - `YOUR_DOCKER_HUB_PERSONAL_ACCESS_TOKEN` - Your Docker Hub Personal Access Token
-  - `/FULL/PATH/TO/YOUR/docker-hub-mcp-server` - The complete path to where you cloned this 
+  - `/FULL/PATH/TO/YOUR/docker-hub-mcp-server` - The complete path to where you cloned this
 
 ```json
 {
@@ -105,16 +112,17 @@
   }
 }
 ```
-2. Open the `Command Palette` and type `MCP: List Servers`.
-3. Select `docker-hub` and select `Start Server`.
+
+1. Open the `Command Palette` and type `MCP: List Servers`.
+1. Select `docker-hub` and select `Start Server`.
 
 ## Usage examples
 
 This section provides task-oriented examples for common operations with Docker Hub
 tools.
 
+### Finding images
 
-### Finding images 
 
 ```console
 # Search for official images
@@ -123,7 +131,7 @@
 # Search for lightweight images to reduce deployment size and improve performance
 $ docker ai "Search for minimal Node.js images with small footprint"
 
-# Get the most recent tag of a base image 
+# Get the most recent tag of a base image
 $ docker ai "Show me the latest tag details for go"
 
 # Find a production-ready database with enterprise features and reliability
@@ -133,7 +141,6 @@
 $ docker ai "Help me find the right Ubuntu version for my project"
 ```
 
-
 ### Repository management
 
 ```console
@@ -156,7 +163,8 @@
 $ docker ai "Show me information about my '<repository-name>' repository"
 ```
 
-### Pull/push images 
+### Pull/push images
+
 
 ```console
 # Pull latest PostgreSQL version

diff --git a/content/manuals/ai/mcp-catalog-and-toolkit/toolkit.md b/content/manuals/ai/mcp-catalog-and-toolkit/toolkit.md
@@ -7,7 +7,7 @@
   - /ai/gordon/mcp/gordon-mcp-server/
 ---
 
-The Docker MCP Toolkit enables seamless setup, management, and execution of containerized MCP servers and their connections to AI agents. It removes the friction from tool usage by offering secure defaults, one-click setup, and support for a growing ecosystem of LLM-based clients. It is the fastest path from MCP tool discovery to local execution.
+The Docker MCP Toolkit is a gateway that enables seamless setup, management, and execution of containerized MCP servers and their connections to AI agents. It removes the friction from tool usage by offering secure defaults, one-click setup, and support for a growing ecosystem of LLM-based clients. It is the fastest path from MCP tool discovery to local execution.
 
 ## Key features
 
@@ -18,7 +18,7 @@
 
 ## How the MCP toolkit works
 
-MCP introduces two core concepts: MCP clients and MCP servers. 
+MCP introduces two core concepts: MCP clients and MCP servers.
 
 - MCP clients are typically embedded in LLM-based applications, such as
   the Claude Desktop App. They request resources or actions.
@@ -55,7 +55,7 @@
 
 ### Passive security
 
-- Image signing and attestation: All MCP server images under `mcp/` in the [catalog](catalog.md) 
+- Image signing and attestation: All MCP server images under `mcp/` in the [catalog](catalog.md)
   are built by Docker and digitally
   signed to verify their source and integrity. Each image includes a Software
   Bill of Materials (SBOM) for full transparency.
@@ -95,7 +95,7 @@
    When you select a server you can see the following
    information:
 
-   - Tool name and description 
+   - Tool name and description
    - Partner/publisher
    - The list of callable tools the server provides.
 
@@ -140,21 +140,21 @@
 
 ### Example: Use Claude Desktop as a client
 
-Imagine you have Claude Desktop installed, and you want to use the GitHub MCP server, 
+Imagine you have Claude Desktop installed, and you want to use the GitHub MCP server,
 and the Puppeteer MCP server, you do not have to install the servers in Claude Desktop.
 You can simply install these 2 MCP servers in the MCP Toolkit,
 and add Claude Desktop as a client:
 
 1. From the **MCP Toolkit** menu, select the **Catalog** tab and find the **Puppeteer** server and add it.
 2. Repeat for the **GitHub Official** server.
-3. From the **Clients** tab, select **Connect** next to **Claude Desktop**. Restart 
+3. From the **Clients** tab, select **Connect** next to **Claude Desktop**. Restart
    Claude Desktop if it's running, and it can now access all the servers in the MCP Toolkit.
 4. Within Claude Desktop, run a test by submitting the following prompt using the Sonnet 3.5 model:
 
    ```text
    Take a screenshot of docs.docker.com and then invert the colors
    ```
-5. From the **Clients** tab, select **Connect** next to **Claude Desktop**. Restart 
+5. From the **Clients** tab, select **Connect** next to **Claude Desktop**. Restart
    Claude Desktop if it's running, and it can now access all the servers in the MCP Toolkit.
 6. Within Claude Desktop, run a test by submitting the following prompt using the Sonnet 3.5 model:
 
@@ -173,7 +173,7 @@
    {{< tab name="Enable globally">}}
 
    1. Insert the following in your VS Code's User`settings.json`:
-   
+
       ```json
       "mcp": {
        "servers": {
@@ -195,11 +195,11 @@
 
    1. In your terminal, navigate to your project's folder.
    1. Run:
-    
+
       ```bash
       docker mcp client connect vscode
       ```
-   
+
       > [!NOTE]
       > This command creates a `.vscode/mcp.json` file in the current directory. We
       > recommend you add it to your  `.gitignore` file.
@@ -208,7 +208,7 @@
   {{</tabs >}}
 
 1. In Visual Studio Code, open a new Chat and select the **Agent** mode:
-   
+
    ![Copilot mode switching](./images/copilot-mode.png)
 
 1. You can also check the available MCP tools:
@@ -224,11 +224,15 @@
 OAuth integration. For now, the MCP Toolkit only supports GitHub OAuth.
 
 1. On https://github.com/, ensure you are signed in.
-1. In Docker Desktop, select **MCP Toolkit** and select the **OAuth** tab. 
+1. In Docker Desktop, select **MCP Toolkit** and select the **OAuth** tab.
 1. In the GitHub entry, select **Authorize**. Your browser opens the GitHub authorization page.
 1. In the GitHub authorization page, select **Authorize Docker**. Once the authorization
    is successful, you are automatically redirected to Docker Desktop.
 1. Install the **GitHub Official** MCP server, see [Install an MCP server](#install-an-mcp-server).
 
 The MCP Toolkit now has access to your GitHub account. To revoke access, select **Revoke** in the **OAuth** tab.
 See an example in [Use the **GitHub Official** MCP server](#example-use-the-github-official-mcp-server).
+
+## Related pages
+
+- [Open-source MCP Gateway](/manuals/ai/mcp-gateway/_index.md)