diff options
| author | baude <bbaude@redhat.com> | 2019-04-25 16:18:40 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-04-26 10:39:29 -0500 |
| commit | 4f2666bec072fd0d556ad5b280679386e4f24ed7 (patch) | |
| tree | 366e59bde914cbc50c951b4bf96835629f30da6d /pkg/adapter/containers_remote.go | |
| parent | a01c62fcbde1afdc77aa05b71c3c84ddacf7fc55 (diff) | |
| download | podman-4f2666bec072fd0d556ad5b280679386e4f24ed7.tar.gz podman-4f2666bec072fd0d556ad5b280679386e4f24ed7.tar.bz2 podman-4f2666bec072fd0d556ad5b280679386e4f24ed7.zip | |
Fix remote-client testing reports
Ensure when using remote attach --no-stdin a mock device is used to
prevent stdin and not nil. This fixes issue #3009.
When starting a container with the remote client, if the container is
already running and the user asks to attach, we should just attach.
This fixes issue #3011
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/adapter/containers_remote.go')
| -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 e8f221eaf..985310cce 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 { |