From 7d251fdcc67f13fc603b806bdb2ba275b0124779 Mon Sep 17 00:00:00 2001 From: Parker Van Roy Date: Wed, 7 Oct 2020 14:54:11 -0400 Subject: [PATCH] solves docker inconsistency for podman attach x Signed-off-by: Parker Van Roy --- pkg/domain/infra/abi/containers.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index d92911e0ce93..05a5826fd1c5 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -312,7 +312,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string, reports = append(reports, &report) continue } - report.Err = errors.Wrapf(err, "failed to evict container: %q", id) + report.Err = errors.Wrapf(err, "Failed to evict container: %q", id) reports = append(reports, &report) continue } @@ -582,6 +582,7 @@ func (ic *ContainerEngine) ContainerAttach(ctx context.Context, nameOrID string, if err != nil && errors.Cause(err) != define.ErrDetach { return errors.Wrapf(err, "error attaching to container %s", ctr.ID()) } + os.Stdout.WriteString("read escape sequence\n") return nil } @@ -604,7 +605,7 @@ func checkExecPreserveFDs(options entities.ExecOptions) error { if options.PreserveFDs > 0 { entries, err := ioutil.ReadDir("/proc/self/fd") if err != nil { - return err + return errors.Wrapf(err, "unable to read /proc/self/fd") } m := make(map[int]bool)