Refactor Docker command execution to support custom engine configuration

Author: itzCozi

internal/commands/shell.go

@@ -54,7 +54,7 @@ var shellCmd = &cobra.Command{
 			}
 		}
 
-		checkCmd := exec.Command("docker", "exec", project.BoxName, "test", "-f", "/etc/devbox-initialized")
+		checkCmd := exec.Command(engineCmd(), "exec", project.BoxName, "test", "-f", "/etc/devbox-initialized")
 		if checkCmd.Run() != nil {
 			fmt.Printf("Setting up devbox commands in box...\n")
 			if err := dockerClient.SetupDevboxInBox(project.BoxName, projectName); err != nil {

internal/commands/up.go

@@ -6,12 +6,20 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 
 	"github.com/spf13/cobra"
 
 	"devbox/internal/config"
 )
 
+func engineCmd() string {
+	if v := strings.TrimSpace(os.Getenv("DEVBOX_ENGINE")); v != "" {
+		return v
+	}
+	return "docker"
+}
+
 var (
 	upDotfilesPath string
 )
@@ -76,7 +84,7 @@ var upCmd = &cobra.Command{
 				}
 			}
 
-			checkCmd := exec.Command("docker", "exec", boxName, "test", "-f", "/etc/devbox-initialized")
+			checkCmd := exec.Command(engineCmd(), "exec", boxName, "test", "-f", "/etc/devbox-initialized")
 			if checkCmd.Run() != nil {
 				if err := dockerClient.SetupDevboxInBox(boxName, projectName); err != nil {
 					return fmt.Errorf("failed to setup devbox in existing box: %w", err)

internal/config/config.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"errors"
+
 	"github.com/xeipuuv/gojsonschema"
 )
 
@@ -50,6 +52,7 @@ type ProjectConfig struct {
 	Restart       string            `json:"restart,omitempty"`
 	HealthCheck   *HealthCheck      `json:"health_check,omitempty"`
 	Resources     *Resources        `json:"resources,omitempty"`
+	Gpus          string            `json:"gpus,omitempty"`
 }
 
 type HealthCheck struct {
@@ -145,9 +148,21 @@ func (cm *ConfigManager) Save(config *Config) error {
 }
 
 func (cm *ConfigManager) LoadProjectConfig(projectPath string) (*ProjectConfig, error) {
-	configPath := filepath.Join(projectPath, "devbox.json")
-
-	if _, err := os.Stat(configPath); os.IsNotExist(err) {
+	// Support multiple filenames for project config to avoid clashes with other tools
+	candidates := []string{
+		filepath.Join(projectPath, "devbox.json"),         // default
+		filepath.Join(projectPath, "devbox.project.json"), // alternative
+		filepath.Join(projectPath, ".devbox.json"),        // dotfile style
+	}
+
+	var configPath string
+	for _, p := range candidates {
+		if _, err := os.Stat(p); err == nil {
+			configPath = p
+			break
+		}
+	}
+	if configPath == "" {
 		return nil, nil
 	}
 
@@ -165,7 +180,19 @@ func (cm *ConfigManager) LoadProjectConfig(projectPath string) (*ProjectConfig,
 }
 
 func (cm *ConfigManager) SaveProjectConfig(projectPath string, config *ProjectConfig) error {
-	configPath := filepath.Join(projectPath, "devbox.json")
+	// If an existing config file with a supported name exists, write back to it; otherwise use default
+	candidates := []string{
+		filepath.Join(projectPath, "devbox.json"),
+		filepath.Join(projectPath, "devbox.project.json"),
+		filepath.Join(projectPath, ".devbox.json"),
+	}
+	configPath := candidates[0]
+	for _, p := range candidates {
+		if _, err := os.Stat(p); err == nil {
+			configPath = p
+			break
+		}
+	}
 
 	data, err := json.MarshalIndent(config, "", "  ")
 	if err != nil {
@@ -199,7 +226,7 @@ func (cm *ConfigManager) ValidateProjectConfig(cfg *ProjectConfig) error {
 			b.WriteString(e.String())
 			b.WriteString("\n")
 		}
-		return fmt.Errorf(strings.TrimSpace(b.String()))
+		return errors.New(strings.TrimSpace(b.String()))
 	}
 
 	for _, port := range cfg.Ports {
@@ -523,7 +550,8 @@ const ProjectConfigJSONSchema = `{
 				"memory": {"type": "string"}
 			},
 			"additionalProperties": false
-		}
+		},
+		"gpus": {"type": "string"}
 	},
 	"additionalProperties": false
 }`