Merge pull request #3026 from baude/remotestartattach

Fix remote-client testing reports

2 files changed, 14 insertions, 5 deletions

diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go
index 93875dd8a..5a67d4957 100644
--- a/pkg/adapter/containers_remote.go
+++ b/pkg/adapter/containers_remote.go
@@ -584,7 +584,10 @@ func (r *LocalRuntime) Attach(ctx context.Context, c *cliconfig.AttachValues) er
 	}
 	inputStream := os.Stdin
 	if c.NoStdin {
-		inputStream = nil
+		inputStream, err = os.Open(os.DevNull)
+		if err != nil {
+			return err
+		}
 	}
 	errChan, err := r.attach(ctx, inputStream, os.Stdout, c.InputArgs[0], false, c.DetachKeys)
 	if err != nil {
diff --git a/pkg/varlinkapi/attach.go b/pkg/varlinkapi/attach.go
index 9e2a265be..6c62d3514 100644
--- a/pkg/varlinkapi/attach.go
+++ b/pkg/varlinkapi/attach.go
@@ -53,7 +53,13 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st
 	if err != nil {
 		return call.ReplyErrorOccurred(err.Error())
 	}
-
+	state, err := ctr.State()
+	if err != nil {
+		return call.ReplyErrorOccurred(err.Error())
+	}
+	if !start && state != libpod.ContainerStateRunning {
+		return call.ReplyErrorOccurred("container must be running to attach")
+	}
 	reader, writer, _, pw, streams := setupStreams(call)
 
 	go func() {
@@ -62,10 +68,10 @@ func (i *LibpodAPI) Attach(call iopodman.VarlinkCall, name string, detachKeys st
 		}
 	}()
 
-	if start {
-		finalErr = startAndAttach(ctr, streams, detachKeys, resize, errChan)
-	} else {
+	if state == libpod.ContainerStateRunning {
 		finalErr = attach(ctr, streams, detachKeys, resize, errChan)
+	} else {
+		finalErr = startAndAttach(ctr, streams, detachKeys, resize, errChan)
 	}
 
 	if finalErr != libpod.ErrDetach && finalErr != nil {