attach: wait for exit code from ContainerWait

Such as with `docker run`, if a user CTRL-Cs while attached to a
container, we should forward the signal and wait for the exit from
`ContainerWait`, instead of just returning.

Signed-off-by: Laura Brehm <[email protected]>

Author: laurazard

cli/command/container/attach.go

@@ -72,7 +72,8 @@ func RunAttach(ctx context.Context, dockerCLI command.Cli, containerID string, o
 	apiClient := dockerCLI.Client()
 
 	// request channel to wait for client
-	resultC, errC := apiClient.ContainerWait(ctx, containerID, "")
+	waitCtx := context.WithoutCancel(ctx)
+	resultC, errC := apiClient.ContainerWait(waitCtx, containerID, "")
 
 	c, err := inspectContainerAndCheckState(ctx, apiClient, containerID)
 	if err != nil {
@@ -163,9 +164,6 @@ func getExitStatus(errC <-chan error, resultC <-chan container.WaitResponse) err
 			return cli.StatusError{StatusCode: int(result.StatusCode)}
 		}
 	case err := <-errC:
-		if errors.Is(err, context.Canceled) {
-			return nil
-		}
 		return err
 	}
 

e2e/container/attach_test.go

@@ -49,6 +49,6 @@ func TestAttachInterrupt(t *testing.T) {
 	c.Process.Signal(os.Interrupt)
 
 	_ = c.Wait()
-	assert.Equal(t, c.ProcessState.ExitCode(), 0)
+	assert.Equal(t, c.ProcessState.ExitCode(), 130)
 	assert.Equal(t, d.String(), "")
 }