fix --process-compose-file issue

jetify-com · Aug 3, 2023 · 5155490 · 5155490
1 parent 02e522e
commit 5155490
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/devbox.go b/devbox.go
@@ -42,7 +42,7 @@ type Devbox interface {
  Remove(ctx context.Context, pkgs ...string) error
  RestartServices(ctx context.Context, services ...string) error
  RunScript(ctx context.Context, scriptName string, scriptArgs []string) error
- Services() (services.Services, error)
+ Services(userProcessCompose string) (services.Services, error)
  // Shell generates the devbox environment and launches nix-shell as a child process.
  Shell(ctx context.Context) error
  StartProcessManager(ctx context.Context, requestedServices []string, background bool, processComposeFileOrDir string) error

diff --git a/internal/impl/devbox.go b/internal/impl/devbox.go
@@ -478,7 +478,7 @@ func (d *Devbox) saveCfg() error {
  return d.cfg.SaveTo(d.ProjectDir())
 }
 
-func (d *Devbox) Services() (services.Services, error) {
+func (d *Devbox) Services(userProcessCompose string) (services.Services, error) {
  pluginSvcs, err := d.pluginManager.GetServices(
  d.PackagesAsInputs(),
  d.cfg.Include,
@@ -487,7 +487,7 @@ func (d *Devbox) Services() (services.Services, error) {
  return nil, err
  }
 
- userSvcs := services.FromUserProcessCompose(d.projectDir)
+ userSvcs := services.FromUserProcessCompose(d.projectDir, userProcessCompose)
 
  svcSet := lo.Assign(pluginSvcs, userSvcs)
  keys := make([]string, 0, len(svcSet))
@@ -515,7 +515,7 @@ func (d *Devbox) StartServices(ctx context.Context, serviceNames ...string) erro
  return d.StartProcessManager(ctx, serviceNames, true, "")
  }
 
- svcSet, err := d.Services()
+ svcSet, err := d.Services("")
  if err != nil {
  return err
  }
@@ -563,7 +563,7 @@ func (d *Devbox) StopServices(ctx context.Context, allProjects bool, serviceName
  return services.StopProcessManager(ctx, d.projectDir, d.writer)
  }
 
- svcSet, err := d.Services()
+ svcSet, err := d.Services("")
  if err != nil {
  return err
  }
@@ -585,7 +585,7 @@ func (d *Devbox) ListServices(ctx context.Context) error {
  return d.RunScript(ctx, "devbox", []string{"services", "ls"})
  }
 
- svcSet, err := d.Services()
+ svcSet, err := d.Services("")
  if err != nil {
  return err
  }
@@ -631,7 +631,7 @@ func (d *Devbox) RestartServices(ctx context.Context, serviceNames ...string) er
 
  // TODO: Restart with no services should restart the _currently running_ services. This means we should get the list of running services from the process-compose, then restart them all.
 
- svcSet, err := d.Services()
+ svcSet, err := d.Services("")
  if err != nil {
  return err
  }
@@ -656,7 +656,7 @@ func (d *Devbox) StartProcessManager(
  background bool,
  processComposeFileOrDir string,
 ) error {
- svcs, err := d.Services()
+ svcs, err := d.Services(processComposeFileOrDir)
  if err != nil {
  return err
  }
@@ -699,13 +699,14 @@ func (d *Devbox) StartProcessManager(
 
  // Start the process manager
 
+ fmt.Printf("Starting with File or Dir: %s\n", processComposeFileOrDir)
  return services.StartProcessManager(
  ctx,
  d.writer,
  requestedServices,
  svcs,
  d.projectDir,
- processComposePath, processComposeFileOrDir,
+ processComposePath,
  background,
  )
 }

diff --git a/internal/services/config.go b/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
  }

diff --git a/internal/services/manager.go b/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`")
  }