diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-21 15:00:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 15:00:22 -0500 |
| commit | 182646b01a4544902c9fdf9326889a0ced7d9a8e (patch) | |
| tree | d37e89ca4c27877098a4136910db68158e71d855 /pkg/domain/infra/tunnel/helpers.go | |
| parent | 076f77b964329c830664b4d6fa3234f608f07591 (diff) | |
| parent | 401dcff8389e10c6fd88ad34f82daccb8f800d3f (diff) | |
| download | podman-182646b01a4544902c9fdf9326889a0ced7d9a8e.tar.gz podman-182646b01a4544902c9fdf9326889a0ced7d9a8e.tar.bz2 podman-182646b01a4544902c9fdf9326889a0ced7d9a8e.zip | |
Merge pull request #8775 from baude/bindings3cons
podman v3 container bindings
Diffstat (limited to 'pkg/domain/infra/tunnel/helpers.go')
| -rw-r--r-- | pkg/domain/infra/tunnel/helpers.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go index cd116995f..0a806d860 100644 --- a/pkg/domain/infra/tunnel/helpers.go +++ b/pkg/domain/infra/tunnel/helpers.go @@ -4,7 +4,6 @@ import ( "context" "github.com/containers/podman/v2/libpod/define" - "github.com/containers/podman/v2/pkg/bindings" "github.com/containers/podman/v2/pkg/bindings/containers" "github.com/containers/podman/v2/pkg/bindings/pods" "github.com/containers/podman/v2/pkg/domain/entities" @@ -18,8 +17,8 @@ func getContainersByContext(contextWithConnection context.Context, all, ignore b if all && len(namesOrIDs) > 0 { return nil, errors.New("cannot lookup containers and all") } - - allContainers, err := containers.List(contextWithConnection, nil, bindings.PTrue, nil, nil, nil, bindings.PTrue) + options := new(containers.ListOptions).WithAll(true).WithSync(true) + allContainers, err := containers.List(contextWithConnection, options) if err != nil { return nil, err } @@ -38,7 +37,7 @@ func getContainersByContext(contextWithConnection context.Context, all, ignore b // First determine if the container exists by doing an inspect. // Inspect takes supports names and IDs and let's us determine // a containers full ID. - inspectData, err := containers.Inspect(contextWithConnection, nameOrID, bindings.PFalse) + inspectData, err := containers.Inspect(contextWithConnection, nameOrID, new(containers.InspectOptions).WithSize(false)) if err != nil { if ignore && errorhandling.Contains(err, define.ErrNoSuchCtr) { continue |