diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-06 22:04:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 22:04:16 +0200 |
| commit | 843fa25890199c04b8419833d39bdedf4ead391c (patch) | |
| tree | 42d2d5b7b9c457935c963de6aa601433f1fd734e /pkg/domain/infra/tunnel/helpers.go | |
| parent | 7d95e0c47ad7203c6ad3e5a0441a309e5368dc52 (diff) | |
| parent | b22254dc8bfdea5153761e93298182286f874bac (diff) | |
| download | podman-843fa25890199c04b8419833d39bdedf4ead391c.tar.gz podman-843fa25890199c04b8419833d39bdedf4ead391c.tar.bz2 podman-843fa25890199c04b8419833d39bdedf4ead391c.zip | |
Merge pull request #5716 from baude/v2ps
podmanv2 ps
Diffstat (limited to 'pkg/domain/infra/tunnel/helpers.go')
| -rw-r--r-- | pkg/domain/infra/tunnel/helpers.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go index f9183c955..682d60d6a 100644 --- a/pkg/domain/infra/tunnel/helpers.go +++ b/pkg/domain/infra/tunnel/helpers.go @@ -5,7 +5,6 @@ import ( "strings" "github.com/containers/libpod/libpod/define" - "github.com/containers/libpod/pkg/api/handlers/libpod" "github.com/containers/libpod/pkg/bindings" "github.com/containers/libpod/pkg/bindings/containers" "github.com/containers/libpod/pkg/bindings/pods" @@ -14,9 +13,9 @@ import ( "github.com/pkg/errors" ) -func getContainersByContext(contextWithConnection context.Context, all bool, namesOrIds []string) ([]libpod.ListContainer, error) { +func getContainersByContext(contextWithConnection context.Context, all bool, namesOrIds []string) ([]entities.ListContainer, error) { var ( - cons []libpod.ListContainer + cons []entities.ListContainer ) if all && len(namesOrIds) > 0 { return nil, errors.New("cannot lookup containers and all") |