Merge pull request #8045 from andylibrian/podman-remote-cleanly-exit-on-detachkeyspressed

Update podman-remote run and start to handle detach keys

2 files changed, 45 insertions, 12 deletions

diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go
index 3bd85fbae..7b321af93 100644
--- a/pkg/bindings/containers/attach.go
+++ b/pkg/bindings/containers/attach.go
@@ -19,6 +19,7 @@ import (
 	"github.com/containers/podman/v2/pkg/bindings"
 	sig "github.com/containers/podman/v2/pkg/signal"
 	"github.com/containers/podman/v2/utils"
+	"github.com/moby/term"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh/terminal"
@@ -60,8 +61,14 @@ func Attach(ctx context.Context, nameOrID string, detachKeys *string, logs, stre
 	}
 
 	params := url.Values{}
+	detachKeysInBytes := []byte{}
 	if detachKeys != nil {
 		params.Add("detachKeys", *detachKeys)
+
+		detachKeysInBytes, err = term.ToBytes(*detachKeys)
+		if err != nil {
+			return errors.Wrapf(err, "invalid detach keys")
+		}
 	}
 	if logs != nil {
 		params.Add("logs", fmt.Sprintf("%t", *logs))
@@ -141,27 +148,51 @@ func Attach(ctx context.Context, nameOrID string, detachKeys *string, logs, stre
 		attachReady <- true
 	}
 
+	stdoutChan := make(chan error)
+	stdinChan := make(chan error)
+
 	if isSet.stdin {
 		go func() {
 			logrus.Debugf("Copying STDIN to socket")
-			_, err := utils.CopyDetachable(socket, stdin, []byte{})
-			if err != nil {
+
+			_, err := utils.CopyDetachable(socket, stdin, detachKeysInBytes)
+
+			if err != nil && err != define.ErrDetach {
 				logrus.Error("failed to write input to service: " + err.Error())
 			}
+			stdinChan <- err
 		}()
 	}
 
 	buffer := make([]byte, 1024)
 	if ctnr.Config.Tty {
-		logrus.Debugf("Copying STDOUT of container in terminal mode")
+		go func() {
+			logrus.Debugf("Copying STDOUT of container in terminal mode")
 
-		if !isSet.stdout {
-			return fmt.Errorf("container %q requires stdout to be set", ctnr.ID)
-		}
-		// If not multiplex'ed, read from server and write to stdout
-		_, err := io.Copy(stdout, socket)
-		if err != nil {
-			return err
+			if !isSet.stdout {
+				stdoutChan <- fmt.Errorf("container %q requires stdout to be set", ctnr.ID)
+			}
+			// If not multiplex'ed, read from server and write to stdout
+			_, err := io.Copy(stdout, socket)
+
+			stdoutChan <- err
+		}()
+
+		for {
+			select {
+			case err := <-stdoutChan:
+				if err != nil {
+					return err
+				}
+
+				return nil
+			case err := <-stdinChan:
+				if err != nil {
+					return err
+				}
+
+				return nil
+			}
 		}
 	} else {
 		logrus.Debugf("Copying standard streams of container in non-terminal mode")
@@ -205,7 +236,6 @@ func Attach(ctx context.Context, nameOrID string, detachKeys *string, logs, stre
 			}
 		}
 	}
-	return nil
 }
 
 // DemuxHeader reads header for stream from server multiplexed stdin/stdout/stderr/2nd error channel
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 1bb4e68ac..eb591d23d 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -500,7 +500,6 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
 			if err == define.ErrDetach {
 				// User manually detached
 				// Exit cleanly immediately
-				report.Err = err
 				reports = append(reports, &report)
 				return reports, nil
 			}
@@ -573,6 +572,10 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 
 	// Attach
 	if err := startAndAttach(ic, con.ID, &opts.DetachKeys, opts.InputStream, opts.OutputStream, opts.ErrorStream); err != nil {
+		if err == define.ErrDetach {
+			return &report, nil
+		}
+
 		report.ExitCode = define.ExitCode(err)
 		if opts.Rm {
 			if rmErr := containers.Remove(ic.ClientCxt, con.ID, bindings.PFalse, bindings.PTrue); rmErr != nil {