diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-30 15:27:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 15:27:37 +0200 |
| commit | fc9451ed15e3ea2fbdcd5754b367db74eec1063e (patch) | |
| tree | 7809c97d047c313d6f78a5f05b075710d2f2aa50 /pkg/domain/infra | |
| parent | 99f8cfc2dc39b11cd315062167f1ffaf85eda946 (diff) | |
| parent | 75eeb40f41f2839dc91281e24b1094180b97a8aa (diff) | |
| download | podman-fc9451ed15e3ea2fbdcd5754b367db74eec1063e.tar.gz podman-fc9451ed15e3ea2fbdcd5754b367db74eec1063e.tar.bz2 podman-fc9451ed15e3ea2fbdcd5754b367db74eec1063e.zip | |
Merge pull request #6047 from QiWang19/attach-test
testv2: enable attach test
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 4c3389418..82bf82bf0 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -514,7 +514,7 @@ func (ic *ContainerEngine) ContainerAttach(ctx context.Context, nameOrId string, } // If the container is in a pod, also set to recursively start dependencies - if err := terminal.StartAttachCtr(ctx, ctr, options.Stdin, options.Stderr, options.Stdin, options.DetachKeys, options.SigProxy, false, ctr.PodID() != ""); err != nil && errors.Cause(err) != define.ErrDetach { + if err := terminal.StartAttachCtr(ctx, ctr, options.Stdout, options.Stderr, options.Stdin, options.DetachKeys, options.SigProxy, false, ctr.PodID() != ""); err != nil && errors.Cause(err) != define.ErrDetach { return errors.Wrapf(err, "error attaching to container %s", ctr.ID()) } return nil |