fix --process-compose-file issue (#1345)

## Summary

Fix the issue where passing a custom process compose file with
`--process-compose-file` failed to load custom services

## How was it tested?

1. Add a process-compose.yaml with a service in a custom path
2. Load the file with `devbox services up --process-compose-file
path/to/file
3. Verify that the service starts

Author: Lagoja

internal/boxcli/services.go

@@ -169,8 +169,9 @@ func startProcessManager(
 	flags serviceUpFlags,
 ) error {
 	box, err := devbox.Open(&devopt.Opts{
-		Dir:    servicesFlags.config.path,
-		Writer: cmd.ErrOrStderr(),
+		Dir:                      servicesFlags.config.path,
+		CustomProcessComposeFile: flags.processComposeFile,
+		Writer:                   cmd.ErrOrStderr(),
 	})
 	if err != nil {
 		return errors.WithStack(err)

internal/impl/devbox.go

@@ -52,13 +52,14 @@ const (
 )
 
 type Devbox struct {
-	cfg               *devconfig.Config
-	lockfile          *lock.File
-	nix               nix.Nixer
-	projectDir        string
-	pluginManager     *plugin.Manager
-	pure              bool
-	allowInsecureAdds bool
+	cfg                      *devconfig.Config
+	lockfile                 *lock.File
+	nix                      nix.Nixer
+	projectDir               string
+	pluginManager            *plugin.Manager
+	pure                     bool
+	allowInsecureAdds        bool
+	customProcessComposeFile string
 
 	// Possible TODO: hardcode this to stderr. Allowing the caller to specify the
 	// writer is error prone. Since it is almost always stderr, we should default
@@ -82,13 +83,14 @@ func Open(opts *devopt.Opts) (*Devbox, error) {
 	}
 
 	box := &Devbox{
-		cfg:               cfg,
-		nix:               &nix.Nix{},
-		projectDir:        projectDir,
-		pluginManager:     plugin.NewManager(),
-		writer:            opts.Writer,
-		pure:              opts.Pure,
-		allowInsecureAdds: opts.AllowInsecureAdds,
+		cfg:                      cfg,
+		nix:                      &nix.Nix{},
+		projectDir:               projectDir,
+		pluginManager:            plugin.NewManager(),
+		writer:                   opts.Writer,
+		pure:                     opts.Pure,
+		customProcessComposeFile: opts.CustomProcessComposeFile,
+		allowInsecureAdds:        opts.AllowInsecureAdds,
 	}
 
 	lock, err := lock.GetFile(box)
@@ -487,7 +489,7 @@ func (d *Devbox) Services() (services.Services, error) {
 		return nil, err
 	}
 
-	userSvcs := services.FromUserProcessCompose(d.projectDir)
+	userSvcs := services.FromUserProcessCompose(d.projectDir, d.customProcessComposeFile)
 
 	svcSet := lo.Assign(pluginSvcs, userSvcs)
 	keys := make([]string, 0, len(svcSet))
@@ -656,6 +658,19 @@ func (d *Devbox) StartProcessManager(
 	background bool,
 	processComposeFileOrDir string,
 ) error {
+
+	if !d.IsEnvEnabled() {
+		args := []string{"services", "up"}
+		args = append(args, requestedServices...)
+		if processComposeFileOrDir != "" {
+			args = append(args, "--process-compose-file", processComposeFileOrDir)
+		}
+		if background {
+			args = append(args, "--background")
+		}
+		return d.RunScript(ctx, "devbox", args)
+	}
+
 	svcs, err := d.Services()
 	if err != nil {
 		return err
@@ -685,17 +700,6 @@ func (d *Devbox) StartProcessManager(
 			return err
 		}
 	}
-	if !d.IsEnvEnabled() {
-		args := []string{"services", "up"}
-		args = append(args, requestedServices...)
-		if processComposeFileOrDir != "" {
-			args = append(args, "--process-compose-file", processComposeFileOrDir)
-		}
-		if background {
-			args = append(args, "--background")
-		}
-		return d.RunScript(ctx, "devbox", args)
-	}
 
 	// Start the process manager
 
@@ -705,7 +709,7 @@ func (d *Devbox) StartProcessManager(
 		requestedServices,
 		svcs,
 		d.projectDir,
-		processComposePath, processComposeFileOrDir,
+		processComposePath,
 		background,
 	)
 }

internal/impl/devopt/devboxopts.go

@@ -5,9 +5,10 @@ import (
 )
 
 type Opts struct {
-	AllowInsecureAdds bool
-	Dir               string
-	Pure              bool
-	IgnoreWarnings    bool
-	Writer            io.Writer
+	AllowInsecureAdds        bool
+	Dir                      string
+	Pure                     bool
+	IgnoreWarnings           bool
+	CustomProcessComposeFile string
+	Writer                   io.Writer
 }

internal/services/config.go

@@ -14,8 +14,8 @@ import (
 	"go.jetpack.io/devbox/internal/cuecfg"
 )
 
-func FromUserProcessCompose(projectDir string) Services {
-	processComposeYaml := lookupProcessCompose(projectDir, "")
+func FromUserProcessCompose(projectDir string, userProcessCompose string) Services {
+	processComposeYaml := lookupProcessCompose(projectDir, userProcessCompose)
 	if processComposeYaml == "" {
 		return nil
 	}

internal/services/manager.go

@@ -122,11 +122,9 @@ func StartProcessManager(
 	availableServices Services,
 	projectDir string,
 	processComposeBinPath string,
-	processComposeFilePath string,
 	processComposeBackground bool,
 ) error {
 	// Check if process-compose is already running
-
 	if ProcessManagerIsRunning(projectDir) {
 		return fmt.Errorf("process-compose is already running. To stop it, run `devbox services stop`")
 	}