compose: start services with a TTY in the background on up -d

compose up -d only passed -d to nerdctl run for services without
stdin_open and tty, so a service with tty: true ran in the foreground
and up -d didn't return until the container exited. docker compose
starts these services detached, and compose attach needs them running
in the background.

Pass -d whenever up (or run) is detached, and don't hand stdin to a
detached run. The attach test no longer needs a pseudo-TTY for up -d.

Signed-off-by: Srinivas Chippagiri <cvas22@gmail.com>

Author: cvas22

cmd/nerdctl/compose/compose_attach_linux_test.go

@@ -51,10 +51,7 @@ services:
 		projectName := filepath.Base(filepath.Dir(composePath))
 		data.Labels().Set("composeYAML", composePath)
 
-		// A container with a TTY needs a console to be created, like with nerdctl run -it.
-		cmd := helpers.Command("compose", "-f", composePath, "up", "-d")
-		cmd.WithPseudoTTY()
-		cmd.Run(&test.Expected{ExitCode: expect.ExitCodeSuccess})
+		helpers.Ensure("compose", "-f", composePath, "up", "-d")
 		nerdtest.EnsureContainerStarted(helpers, serviceparser.DefaultContainerName(projectName, "svc0", "1"))
 	}
 

pkg/composer/run.go

@@ -242,7 +242,7 @@ func (c *Composer) runServices(ctx context.Context, parsedServices []*servicepar
 		container := ps.Containers[0]
 
 		runEG.Go(func() error {
-			id, err := c.upServiceContainer(ctx, ps, container, RecreateForce)
+			id, err := c.upServiceContainer(ctx, ps, container, RecreateForce, ro.Detach)
 			if err != nil {
 				return err
 			}

pkg/composer/up_service.go

@@ -61,7 +61,7 @@ func (c *Composer) upServices(ctx context.Context, parsedServices []*servicepars
 		for _, container := range ps.Containers {
 			container := container
 			runEG.Go(func() error {
-				id, err := c.upServiceContainer(ctx, ps, container, recreate)
+				id, err := c.upServiceContainer(ctx, ps, container, recreate, uo.Detach)
 				if err != nil {
 					return err
 				}
@@ -153,7 +153,8 @@ func (c *Composer) ensureImageMountSources(ctx context.Context, ps *serviceparse
 
 // upServiceContainer must be called after ensureServiceImage
 // upServiceContainer returns container ID
-func (c *Composer) upServiceContainer(ctx context.Context, service *serviceparser.Service, container serviceparser.Container, recreate string) (string, error) {
+// When detach is set, the container is started in the background even if it has a TTY, like docker compose up -d.
+func (c *Composer) upServiceContainer(ctx context.Context, service *serviceparser.Service, container serviceparser.Container, recreate string, detach bool) (string, error) {
 	// check if container already exists
 	existingCid, err := c.containerID(ctx, container.Name, service.Unparsed.Name)
 	if err != nil {
@@ -166,7 +167,7 @@ func (c *Composer) upServiceContainer(ctx context.Context, service *serviceparse
 	}
 
 	var runFlagD bool
-	if !service.Unparsed.StdinOpen && !service.Unparsed.Tty {
+	if detach || (!service.Unparsed.StdinOpen && !service.Unparsed.Tty) {
 		container.RunArgs = append([]string{"-d"}, container.RunArgs...)
 		runFlagD = true
 	}
@@ -266,7 +267,7 @@ func (c *Composer) executeUpCmd(ctx context.Context, cmd *exec.Cmd, containerNam
 		log.G(ctx).Debugf("Running %v", cmd.Args)
 	}
 
-	if stdinOpen {
+	if stdinOpen && !runFlagD {
 		cmd.Stdin = os.Stdin
 	}
 	if !runFlagD {