Address suggestions

Signed-off-by: Juan Antonio Osorio <[email protected]>

Author: JAORMX

docs/toolhive/guides-cli/advanced-cicd.mdx

@@ -5,10 +5,14 @@ description:
   ToolHive.
 ---
 
-This guide covers advanced CI/CD patterns for production environments using
-ToolHive's [`thv build`](../reference/cli/thv_build.md) command. These patterns
-include multi-architecture builds, supply chain security, and efficient change
-detection.
+This guide covers advanced CI/CD patterns for building MCP server containers
+using ToolHive's [`thv build`](../reference/cli/thv_build.md) command. These
+patterns include multi-architecture builds, supply chain security, and efficient
+change detection.
+
+These patterns are intended for anyone building MCP server containers regularly,
+such as maintainers of MCP servers or organizations deploying custom servers or
+repackaging existing ones.
 
 ## Prerequisites
 
@@ -19,9 +23,10 @@ Before implementing these advanced patterns, ensure you have:
 - Container registry access for pushing images
 - Understanding of Docker Buildx for multi-architecture builds
 
-## Multi-architecture builds
+## Multi-architecture MCP server builds
 
-Build containers for multiple architectures (amd64, arm64) using Docker Buildx:
+Build MCP server containers for multiple architectures (amd64, arm64) using
+Docker Buildx:
 
 ```yaml
 name: Multi-arch Build
@@ -42,12 +47,9 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Install ToolHive
-        run: |
-          # Install ToolHive CLI (replace with your preferred installation method)
-          # See: https://github.com/stacklok/toolhive/releases
-          wget https://github.com/stacklok/toolhive/releases/latest/download/toolhive_linux_amd64.tar.gz
-          tar -xzf toolhive_linux_amd64.tar.gz
-          sudo install -m 0755 thv /usr/local/bin/
+        uses: StacklokLabs/toolhive-actions/install@v0
+        with:
+          version: latest
 
       - name: Generate Dockerfile
         run: |
@@ -90,12 +92,9 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Install ToolHive
-        run: |
-          # Install ToolHive CLI (replace with your preferred installation method)
-          # See: https://github.com/stacklok/toolhive/releases
-          wget https://github.com/stacklok/toolhive/releases/latest/download/toolhive_linux_amd64.tar.gz
-          tar -xzf toolhive_linux_amd64.tar.gz
-          sudo install -m 0755 thv /usr/local/bin/
+        uses: StacklokLabs/toolhive-actions/install@v0
+        with:
+          version: latest
 
       - name: Generate Dockerfile
         run: |
@@ -161,12 +160,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install ToolHive
-        run: |
-          # Install ToolHive CLI (replace with your preferred installation method)
-          # See: https://github.com/stacklok/toolhive/releases
-          wget https://github.com/stacklok/toolhive/releases/latest/download/toolhive_linux_amd64.tar.gz
-          tar -xzf toolhive_linux_amd64.tar.gz
-          sudo install -m 0755 thv /usr/local/bin/
+        uses: StacklokLabs/toolhive-actions/install@v0
+        with:
+          version: latest
 
       - name: Build containers
         run: |
@@ -199,12 +195,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install ToolHive
-        run: |
-          # Install ToolHive CLI (replace with your preferred installation method)
-          # See: https://github.com/stacklok/toolhive/releases
-          wget https://github.com/stacklok/toolhive/releases/latest/download/toolhive_linux_amd64.tar.gz
-          tar -xzf toolhive_linux_amd64.tar.gz
-          sudo install -m 0755 thv /usr/local/bin/
+        uses: StacklokLabs/toolhive-actions/install@v0
+        with:
+          version: latest
 
       - name: Build ${{ matrix.server.name }}
         run: |
@@ -233,12 +226,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install ToolHive
-        run: |
-          # Install ToolHive CLI (replace with your preferred installation method)
-          # See: https://github.com/stacklok/toolhive/releases
-          wget https://github.com/stacklok/toolhive/releases/latest/download/toolhive_linux_amd64.tar.gz
-          tar -xzf toolhive_linux_amd64.tar.gz
-          sudo install -m 0755 thv /usr/local/bin/
+        uses: StacklokLabs/toolhive-actions/install@v0
+        with:
+          version: latest
 
       - name: Build container
         run: |
@@ -284,10 +274,11 @@ build:
   services:
     - docker:dind
   before_script:
+    # Install ToolHive CLI using curl and jq to get the latest version
     - |
-      # Install ToolHive CLI
-      wget https://github.com/stacklok/toolhive/releases/latest/download/toolhive_linux_amd64.tar.gz
-      tar -xzf toolhive_linux_amd64.tar.gz
+      VERSION=$(curl -s https://api.github.com/repos/stacklok/toolhive/releases/latest | jq -r .tag_name)
+      wget "https://github.com/stacklok/toolhive/releases/download/${VERSION}/toolhive_${VERSION#v}_linux_amd64.tar.gz"
+      tar -xzf "toolhive_${VERSION#v}_linux_amd64.tar.gz"
       install -m 0755 thv /usr/local/bin/
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
@@ -322,6 +313,6 @@ When implementing advanced CI/CD patterns:
 ## Related information
 
 - [Build MCP server containers](./build-containers.mdx)
-- [Run MCP servers in Kubernetes](../guides-k8s/run-mcp-k8s.md)
+- [Run MCP servers in Kubernetes](../guides-k8s/run-mcp-k8s.mdx)
 - [`thv build` command reference](../reference/cli/thv_build.md)
 - [Secrets management](./secrets-management.mdx)

docs/toolhive/guides-cli/build-containers.mdx

@@ -123,7 +123,7 @@ thv build --tag mcp-git:latest uvx://mcp-server-git@latest
 ## Protocol schemes
 
 The `thv build` command supports the same protocol schemes as
-[`thv run`](./run-mcp-servers.mdx):
+[`thv run`](./run-mcp-servers.mdx#run-a-server-using-protocol-schemes):
 
 ### Python (uvx)
 
@@ -248,12 +248,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install ToolHive
-        run: |
-          # Install ToolHive CLI (replace with your preferred installation method)
-          # See: https://github.com/stacklok/toolhive/releases
-          wget https://github.com/stacklok/toolhive/releases/latest/download/toolhive_linux_amd64.tar.gz
-          tar -xzf toolhive_linux_amd64.tar.gz
-          sudo install -m 0755 thv /usr/local/bin/
+        uses: StacklokLabs/toolhive-actions/install@v0
+        with:
+          version: latest
 
       - name: Log in to Container Registry
         uses: docker/login-action@v3
@@ -322,15 +319,15 @@ thv build --tag my-server:dev go:///path/to/my-project
 
 - Use built containers with [`thv run`](./run-mcp-servers.mdx) for local
   development
-- Deploy pre-built containers to [Kubernetes](../guides-k8s/run-mcp-k8s.md)
+- Deploy pre-built containers to [Kubernetes](../guides-k8s/run-mcp-k8s.mdx)
 - Set up [CI/CD pipelines](#cicd-integration) for automated building
 - Learn about [container registry workflows](#custom-image-tagging)
 
 ## Related information
 
 - [`thv build` command reference](../reference/cli/thv_build.md)
 - [Run MCP servers](./run-mcp-servers.mdx)
-- [Run MCP servers in Kubernetes](../guides-k8s/run-mcp-k8s.md)
+- [Run MCP servers in Kubernetes](../guides-k8s/run-mcp-k8s.mdx)
 - [Custom permissions](./custom-permissions.mdx)
 
 ## Troubleshooting

sidebars.ts

@@ -67,7 +67,6 @@ const sidebars: SidebarsConfig = {
         'toolhive/guides-cli/registry',
         'toolhive/guides-cli/run-mcp-servers',
         'toolhive/guides-cli/build-containers',
-        'toolhive/guides-cli/advanced-cicd',
         'toolhive/guides-cli/manage-mcp-servers',
         'toolhive/guides-cli/secrets-management',
         'toolhive/guides-cli/client-configuration',
@@ -87,6 +86,7 @@ const sidebars: SidebarsConfig = {
           ],
         },
         'toolhive/guides-cli/telemetry-and-metrics',
+        'toolhive/guides-cli/advanced-cicd',
         {
           type: 'category',
           label: 'Command reference',