diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-08 10:16:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 10:16:34 -0700 |
| commit | 8eb03d3e5388d02dbbe5382b5fdb346a45535f84 (patch) | |
| tree | 4bfe883e8e4f51af43b5c14c4e09fdaec889bc8d /cmd/podman/attach.go | |
| parent | 1671ee557a6d354680be475991ca85a82f312a99 (diff) | |
| parent | ba65301c955454e47c3893ca548f18a845a4c4a9 (diff) | |
| download | podman-8eb03d3e5388d02dbbe5382b5fdb346a45535f84.tar.gz podman-8eb03d3e5388d02dbbe5382b5fdb346a45535f84.tar.bz2 podman-8eb03d3e5388d02dbbe5382b5fdb346a45535f84.zip | |
Merge pull request #2746 from baude/remotecreate
podman-remote create|run
Diffstat (limited to 'cmd/podman/attach.go')
| -rw-r--r-- | cmd/podman/attach.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/attach.go b/cmd/podman/attach.go index 86e89cfd7..f326f53c3 100644 --- a/cmd/podman/attach.go +++ b/cmd/podman/attach.go @@ -6,6 +6,7 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/libpodruntime" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/pkg/adapter" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -78,7 +79,7 @@ func attachCmd(c *cliconfig.AttachValues) error { } // If the container is in a pod, also set to recursively start dependencies - if err := startAttachCtr(ctr, os.Stdout, os.Stderr, inputStream, c.DetachKeys, c.SigProxy, false, ctr.PodID() != ""); err != nil && errors.Cause(err) != libpod.ErrDetach { + if err := adapter.StartAttachCtr(getContext(), ctr, os.Stdout, os.Stderr, inputStream, c.DetachKeys, c.SigProxy, false, ctr.PodID() != ""); err != nil && errors.Cause(err) != libpod.ErrDetach { return errors.Wrapf(err, "error attaching to container %s", ctr.ID()) } |