Merge pull request github#332 from xenoscopic/validation-disk-space

ci: add clean task and update validation script to use it

Author: xenoscopic

Taskfile.yml

@@ -4,29 +4,33 @@ tasks:
   create:
     desc: Create a new mcp server definition
     cmd: go run ./cmd/create {{.CLI_ARGS}}
-  
+
   build:
     desc: Build a server image
     cmd: go run ./cmd/build {{.CLI_ARGS}}
 
   catalog:
     desc: Generate a test catalog
     cmd: go run ./cmd/catalog {{.CLI_ARGS}}
-  
+
   wizard:
     desc: Run the wizard
     cmd: go run ./cmd/wizard {{.CLI_ARGS}}
-  
+
   validate:
     desc: Validate a server
     cmd: go run ./cmd/validate {{.CLI_ARGS}}
-  
+
+  clean:
+    desc: Clean build artifacts for servers
+    cmd: go run ./cmd/clean {{.CLI_ARGS}}
+
   import:
     desc: Import a server into the registry
     cmd: docker mcp catalog import ./catalogs/{{.CLI_ARGS}}/catalog.yaml
-  
+
   reset:
     desc: Reset the catalog
     cmds:
       - docker mcp catalog reset
-      - docker mcp catalog init
+      - docker mcp catalog init

cmd/clean/main.go

@@ -0,0 +1,97 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/docker/mcp-registry/pkg/servers"
+)
+
+// main processes the provided server names and cleans build artifacts for each.
+func main() {
+	flag.Parse()
+
+	if flag.NArg() == 0 {
+		fmt.Fprintln(os.Stderr, "Usage: task clean -- <server> [server...]")
+		os.Exit(1)
+	}
+
+	var failed bool
+	for _, name := range flag.Args() {
+		if err := cleanServer(name); err != nil {
+			fmt.Fprintf(os.Stderr, "cleanup failed for %s: %v\n", name, err)
+			failed = true
+		}
+	}
+
+	if failed {
+		os.Exit(1)
+	}
+}
+
+// cleanServer removes generated artifacts and Docker images for the server.
+func cleanServer(name string) error {
+	serverPath := filepath.Join("servers", name, "server.yaml")
+	server, err := servers.Read(serverPath)
+	if err != nil {
+		return fmt.Errorf("reading server file: %w", err)
+	}
+
+	removeCatalog(name)
+	removeDockerImage(server.Image)
+	removeDockerImage("check")
+	pruneDockerBuilder()
+	pruneDockerImages()
+
+	return nil
+}
+
+// removeCatalog deletes the generated catalog directory if it exists.
+func removeCatalog(name string) {
+	path := filepath.Join("catalogs", name)
+	if err := os.RemoveAll(path); err != nil {
+		fmt.Fprintf(os.Stderr, "warning: removing %s: %v\n", path, err)
+	}
+}
+
+// removeDockerImage removes the specified Docker image, ignoring missing images.
+func removeDockerImage(image string) {
+	if image == "" {
+		return
+	}
+
+	out, err := exec.Command("docker", "image", "rm", "-f", image).CombinedOutput()
+	if err != nil {
+		msg := string(out)
+		if strings.Contains(msg, "No such image") {
+			return
+		}
+		fmt.Fprintf(os.Stderr, "warning: removing image %s: %v\n%s", image, err, msg)
+	} else {
+		fmt.Print(string(out))
+	}
+}
+
+// pruneDockerBuilder removes unused builder cache entries.
+func pruneDockerBuilder() {
+	cmd := exec.Command("docker", "builder", "prune", "--force")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		fmt.Fprintf(os.Stderr, "warning: pruning builder cache: %v\n", err)
+	}
+}
+
+// pruneDockerImages removes dangling Docker images.
+func pruneDockerImages() {
+	cmd := exec.Command("docker", "image", "prune", "--force")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		fmt.Fprintf(os.Stderr, "warning: pruning images: %v\n", err)
+	}
+}

scripts/ci-validation.sh

@@ -11,36 +11,42 @@ process_server() {
   local file="$1"
   local dir=$(dirname "$file")
   local name=$(basename "$dir")
-  
+
   echo "Processing server: $name"
   echo "================================"
-  
+
   # Run each command and check for failures
   if ! task validate -- --name "$name"; then
     echo "ERROR: Validation failed for $name"
+    task clean -- "$name" >/dev/null 2>&1 || true
     return 1
   fi
-  
+
   if ! task build -- --tools --pull-community "$name"; then
     echo "ERROR: Build failed for $name"
+    task clean -- "$name" >/dev/null 2>&1 || true
     return 1
   fi
-  
+
   echo "--------------------------------"
-  
+
   if ! task catalog -- "$name"; then
     echo "ERROR: Catalog generation failed for $name"
+    task clean -- "$name" >/dev/null 2>&1 || true
     return 1
   fi
-  
+
   echo "--------------------------------"
-  
+
   cat "catalogs/$name/catalog.yaml"
-  
+
   echo "--------------------------------"
   echo "Successfully processed: $name"
   echo ""
-  
+  if ! task clean -- "$name"; then
+    echo "WARNING: Cleanup encountered issues for $name"
+  fi
+
   return 0
 }
 
@@ -54,10 +60,10 @@ while IFS= read -r file; do
     echo "Skipping already processed server: $name (from file: $file)"
     continue
   fi
-  
+
   # Mark this server as processed
   processed_servers="${processed_servers}|$name|"
-  
+
   if ! process_server "$file"; then
     echo "FAILED: Processing server from file: $file"
     overall_success=false
@@ -71,4 +77,4 @@ if [ "$overall_success" = true ]; then
 else
   echo "One or more servers failed to process!"
   exit 1
-fi
+fi