diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-30 19:48:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-30 19:48:27 +0200 |
commit | 75189d5b97d18d6b1a229e75d8427c85d2872d61 (patch) | |
tree | e948108e25f374c3e5c11a6ffae45472a578123f /pkg/adapter | |
parent | 488117cb99705f6766ee82b78063951f87099b5b (diff) | |
parent | 4f2666bec072fd0d556ad5b280679386e4f24ed7 (diff) | |
download | podman-75189d5b97d18d6b1a229e75d8427c85d2872d61.tar.gz podman-75189d5b97d18d6b1a229e75d8427c85d2872d61.tar.bz2 podman-75189d5b97d18d6b1a229e75d8427c85d2872d61.zip |
Merge pull request #3026 from baude/remotestartattach
Fix remote-client testing reports
Diffstat (limited to 'pkg/adapter')
-rw-r--r-- | pkg/adapter/containers_remote.go | 5 |
1 files changed, 4 insertions, 1 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 { |