-

tucksaun · tucksaun · commit e25d762a672e · 2023-11-02T19:52:21.000+01:00
diff --git a/commands/local_server_start.go b/commands/local_server_start.go
@@ -347,6 +347,14 @@ var localServerStartCmd = &console.Command{
 					}
 
 					if name == project.DockerComposeWorkerKey {
+						originalBuildCmdHook := runner.BuildCmdHook
+
+						runner.BuildCmdHook = func(cmd *exec.Cmd) error {
+							cmd.Args = append(cmd.Args, "--detach")
+
+							return originalBuildCmdHook(cmd)
+						}
+
 						runner.SuccessHook = func(runner *local.Runner, cmd *exec.Cmd) {
 							terminal.Eprintln("<info>INFO</> Docker Compose is now up, switching to non detached mode")
 
@@ -358,25 +366,13 @@ var localServerStartCmd = &console.Command{
 							// have to do anything specific
 							runner.SuccessHook = nil
 							// and we move back AlwaysRestartOnExit to false
-							originalBuildCmdHook := runner.BuildCmdHook
+
 							runner.BuildCmdHook = func(cmd *exec.Cmd) error {
 								runner.AlwaysRestartOnExit = false
 
 								return originalBuildCmdHook(cmd)
 							}
 
-							// disable the docker compose detached mode
-							pidFile.Args = pidFile.Args[:len(pidFile.Args)-1]
-							for i := 0; i < (len(pidFile.Args) - 1); {
-								arg := pidFile.Args[i]
-								if arg == "--detached" || arg == "-d" {
-									pidFile.Args = append(pidFile.Args[:i], pidFile.Args[i+1:]...)
-									continue
-								}
-
-								i++
-							}
-
 							dockerWg.Done()
 						}
 					} else if isDockerComposeWorkerConfigured {
diff --git a/local/project/config.go b/local/project/config.go
@@ -148,7 +148,7 @@ func (c *FileConfig) parseWorkers() error {
 
 	if v, ok := c.Workers[DockerComposeWorkerKey]; ok && v == nil {
 		c.Workers[DockerComposeWorkerKey] = &Worker{
-			Cmd: []string{"docker", "compose", "up", "--detach"},
+			Cmd: []string{"docker", "compose", "up"},
 			Watch: []string{
 				"compose.yaml", "compose.override.yaml",
 				"compose.yml", "compose.override.yml",
