added docker passthrough, host key path absolute path fix

Author: skssmd

.goreleaser.yaml

@@ -255,29 +255,19 @@ release:
   header: |
     ## Feature Update with Graft  🚀
     
-    ### V2.3 Highlights:
+    ### V2.4 Highlights:
+    1. **Docker Passthrough Commands**: Execute docker commands directly on remote hosts or specific registries via Graft.
+    2. **Bug Fixes and Improvements**
+    
+    ### V2 Series Highlights (v2.0 - v2.3):
     1. **Rollback Feature**: Added rollback functionality to revert to previous deployments.
-    2. **Webhook Mapping**: Added webhook mapping functionality to map webhook domains to servers.
-    3. **Multi Environment Support**: Added multi environment support to manage multiple deployment environments.
-                        - Environment Creation
-                        - Environment Specific Configuration
-                        - Environment Specific Workflow Generation
-                        - Environment Specific Host and Deployment
-                        - Environment Specific Commands
-                        - Environment Specific DNS Configurations
-                        - Environment Specific Rollback
-    4. **Bug Fixes and Improvements**
-    
-    ### V2 Highlights:
-    This release introduces significant enhancements to Graft, moving from basic local-to-server deployments to a more robust CI/CD-driven workflow using GitHub Actions and our new `graft-hook` service.
-    
-    1. **Git Remote Modes**: Move away from direct local-to-server channels. Deployments now go through GitHub Workflows and CI/CD channels.
-    2. **Graft-Hook**: A new webhook service personalized specifically for Graft-based servers, maintaining a zero-config solution with proper security.
-    3. **Automated GitHub Workflows**: Graft now generates production-ready workflows automatically from your `graft-compose.yml` context.
-    4. **Enhanced Monitoring**: Easy CLI-based monitoring for `graft-hook`, including real-time build error logs.
-    5. **Cloudflare API Integration**: Automated DNS zone mapping based on Traefik host labels.
-    6. **Cloudflare Zone Registry**: Manage multiple Cloudflare accounts and zones with an interactive selection menu.
-    7. **Database Backup Automation(Infrastructure)**: Easily backup Infrastructure databases to S3/R2(Experimental).
+    2. **Multi Environment Support**: Comprehensive management for multiple deployment environments including specific configurations, workflows, and DNS.
+    3. **Webhook Mapping**: Map webhook domains to servers using Graft.
+    4. **Git Remote Modes**: Deployments now go through GitHub Workflows and CI/CD channels.
+    5. **Graft-Hook**: A new webhook service for Graft-based servers.
+    6. **Automated GitHub Workflows**: Generate workflows automatically from `graft-compose.yml`.
+    7. **Cloudflare Integration**: Automated DNS zone mapping and zone management.
+    8. **Database Backup Automation**: Infrastructure database backups to S3/R2 (Experimental).
   
   footer: |
     ---

cmd/graft/executors/env.go

@@ -35,7 +35,7 @@ func (e *Executor) RunNewEnv(name string) {
 
 	// 2. Server Selection (Copy from RunInit)
 	gCfg := e.GlobalConfig
-	srv, err := project.SelectOrAddServer(reader,gCfg, prompt.PromptNewServer)
+	srv, err := project.SelectOrAddServer(reader,gCfg)
 	if err != nil {
 		fmt.Printf("Error: %v\n", err)
 		return

cmd/graft/executors/host.go

@@ -283,3 +283,26 @@ func (e *Executor) RunHostShell(commandArgs []string) {
 		}
 	}
 }
+
+func (e *Executor) RunHostDocker(commandArgs []string) {
+	
+
+	client, err := e.getClient()
+	if err != nil {
+		fmt.Printf("Error: %v\n", err)
+		return
+	}
+	defer client.Close()
+
+	if len(commandArgs) == 0 {
+		// Interactive SSH
+		fmt.Println("Usage: graft host [init|clean|sh|self-destruct|any docker command]")
+	} else {
+		// Non-interactive command
+		cmdStr := "sudo docker " + strings.Join(commandArgs, " ")
+		fmt.Printf("🚀 Executing on '%s': %s\n", e.Server.RegistryName, cmdStr)
+		if err := client.RunCommand(cmdStr, os.Stdout, os.Stderr); err != nil {
+			fmt.Printf("Error: %v\n", err)
+		}
+	}
+}

cmd/graft/executors/registry.go

@@ -121,6 +121,38 @@ func (e *Executor) RunRegistryShell(registryName string, commandArgs []string) {
 	}
 }
 
+func (e *Executor) RunRegistryDocker(registry string, args []string){
+	gCfg := e.GlobalConfig
+	if gCfg == nil {
+		fmt.Println("Error: Could not load global registry.")
+		return
+	}
+	srv, exists := gCfg.Servers[registry]
+	if !exists {
+		fmt.Printf("Error: Registry '%s' not found.\n", registry)
+		return
+	}
+
+	client, err := ssh.NewClient(srv.Host, srv.Port, srv.User, srv.KeyPath)
+	if err != nil {
+		fmt.Printf("Error: %v\n", err)
+		return
+	}
+	defer client.Close()
+
+	if len(args) == 0 {
+		fmt.Printf("Usage: graft -r <registry name> <any docker command>\n")
+		fmt.Printf("Example: graft -r prod-us ps\n")
+		return
+	} else {
+		cmdStr := "sudo docker " + strings.Join(args, " ")
+		fmt.Printf("🚀 Executing on '%s': %s\n", registry, cmdStr)
+		if err := client.RunCommand(cmdStr, os.Stdout, os.Stderr); err != nil {
+			fmt.Printf("Error: %v\n", err)
+		}
+	}
+}
+
 func (e *Executor) RunRegistryLs() {
 	gCfg := e.GlobalConfig
 	if gCfg == nil || len(gCfg.Servers) == 0 {

cmd/graft/main.go

@@ -45,6 +45,12 @@ func main() {
 			e.RunRegistryShell(registryContext, args[1:])
 			return
 		}
+		// Handle shell directly after -r: graft -r name -sh ...
+		if len(args) > 0 {
+			
+			e.RunRegistryDocker(registryContext, args)
+			return
+		}
 	}
 
 	// Handle project context flag: graft -p projectname ...
@@ -159,7 +165,7 @@ e.RunHook(args[1:])
 		case "self-destruct":
 			e.RunHostSelfDestruct()
 		default:
-			fmt.Println("Usage: graft host [init|clean|sh|self-destruct]")
+			e.RunHostDocker(args[1:])
 		}
 	case "db":
 		if len(args) < 3 || args[2] != "init" {

internal/project/init.go

@@ -39,7 +39,7 @@ func CheckLocalDirectory(reader *bufio.Reader) error {
 }
 
 // SelectOrAddServer prompts the user to select an existing server or add a new one
-func SelectOrAddServer(reader *bufio.Reader, gCfg *config.GlobalConfig, promptNewServerFunc func(*bufio.Reader) (string, int, string, string)) (*config.ServerConfig, error) {
+func SelectOrAddServer(reader *bufio.Reader, gCfg *config.GlobalConfig ) (*config.ServerConfig, error) {
 	var host string
 	var port int
 	var user string
@@ -62,7 +62,7 @@ func SelectOrAddServer(reader *bufio.Reader, gCfg *config.GlobalConfig, promptNe
 		input = strings.TrimSpace(input)
 
 		if input == "/new" {
-			host, port, user, keyPath = promptNewServerFunc(reader)
+			host, port, user, keyPath = prompt.PromptNewServer(reader)
 			fmt.Print("Registry Name (e.g. prod-us): ")
 			registryName, _ = reader.ReadString('\n')
 			registryName = strings.TrimSpace(registryName)
@@ -78,15 +78,15 @@ func SelectOrAddServer(reader *bufio.Reader, gCfg *config.GlobalConfig, promptNe
 				fmt.Printf("✅ Using server: %s\n", registryName)
 			} else {
 				fmt.Println("Invalid selection, entering new server details...")
-				host, port, user, keyPath = promptNewServerFunc(reader)
+				host, port, user, keyPath = prompt.PromptNewServer(reader)
 				fmt.Print("Registry Name (e.g. prod-us): ")
 				registryName, _ = reader.ReadString('\n')
 				registryName = strings.TrimSpace(registryName)
 			}
 		}
 	} else {
 		fmt.Println("No servers found in registry. Enter new server details:")
-		host, port, user, keyPath = promptNewServerFunc(reader)
+		host, port, user, keyPath = prompt.PromptNewServer(reader)
 		fmt.Print("Registry Name (e.g. prod-us): ")
 		registryName, _ = reader.ReadString('\n')
 		registryName = strings.TrimSpace(registryName)
@@ -273,7 +273,7 @@ func InitProjectWorkflow(reader *bufio.Reader, force bool, gCfg *config.GlobalCo
 	}
 
 	// Server Selection
-	srv, err = SelectOrAddServer(reader, gCfg, prompt.PromptNewServer)
+	srv, err = SelectOrAddServer(reader, gCfg)
 	if err != nil {
 		return "", nil, fmt.Errorf("server selection failed: %w", err)
 	}

internal/prompt/prompt.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"fmt"
 	"os/exec"
+	"path/filepath"
 	"strconv"
 	"strings"
 )
@@ -128,6 +129,12 @@ func PromptNewServer(reader *bufio.Reader) (string, int, string, string) {
 	fmt.Print("Key Path: ")
 	keyPath, _ := reader.ReadString('\n')
 	keyPath = strings.TrimSpace(keyPath)
+	//if key path starts with ./ then dow pwd and marge to find absolute keypath
+	keyPath, err := filepath.Abs(keyPath)
+	if err != nil {
+		fmt.Println("Error getting absolute path:", err)
+		return host, port, user, keyPath
+	}
 
 	return host, port, user, keyPath
 }