diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-09 15:56:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 15:56:26 +0200 |
| commit | 1662310e516cb3c21842f59b8f607bb0af408ec5 (patch) | |
| tree | 884889920008afc6f688e4f3d5ceec7f9025139b /pkg/domain/infra | |
| parent | 555b30e9ebdf82dfc2e0c7ddd9f0f8b51ccb4a39 (diff) | |
| parent | 8ce23775a62b816c599e6d65c92985f62acc85c5 (diff) | |
| download | podman-1662310e516cb3c21842f59b8f607bb0af408ec5.tar.gz podman-1662310e516cb3c21842f59b8f607bb0af408ec5.tar.bz2 podman-1662310e516cb3c21842f59b8f607bb0af408ec5.zip | |
Merge pull request #5754 from baude/v2psformat
v2podman ps alter formats
Diffstat (limited to 'pkg/domain/infra')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 4 | ||||
| -rw-r--r-- | pkg/domain/infra/tunnel/helpers.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index d40f0da36..f091e1527 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -242,7 +242,7 @@ func (ic *ContainerEngine) ContainerCheckpoint(ctx context.Context, namesOrIds [ } // narrow the list to running only for _, c := range allCtrs { - if c.State == define.ContainerStateRunning.String() { + if c.ContainerState == define.ContainerStateRunning.String() { ctrs = append(ctrs, c) } } @@ -276,7 +276,7 @@ func (ic *ContainerEngine) ContainerRestore(ctx context.Context, namesOrIds []st } // narrow the list to exited only for _, c := range allCtrs { - if c.State == define.ContainerStateExited.String() { + if c.ContainerState == define.ContainerStateExited.String() { ctrs = append(ctrs, c) } } diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go index 682d60d6a..4d7e45897 100644 --- a/pkg/domain/infra/tunnel/helpers.go +++ b/pkg/domain/infra/tunnel/helpers.go @@ -30,7 +30,7 @@ func getContainersByContext(contextWithConnection context.Context, all bool, nam for _, id := range namesOrIds { var found bool for _, con := range c { - if id == con.ID || strings.HasPrefix(con.ID, id) || util.StringInSlice(id, con.Names) { + if id == con.ID || strings.HasPrefix(con.ID, id) || util.StringInSlice(id, con.ContainerNames) { cons = append(cons, con) found = true break |