diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-14 18:01:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 18:01:18 +0200 |
| commit | a6caae0b5a40ae1ccf536e916624b4f81cdda7f4 (patch) | |
| tree | 0e07eeba9a90f914c01bf79113e670357377c2d2 /pkg/domain/infra | |
| parent | 01c5915a52d6e5d23ad08fd1fcce38dba20f67db (diff) | |
| parent | 830f3a4462953b3698a21031db3964d0f0ae63b3 (diff) | |
| download | podman-a6caae0b5a40ae1ccf536e916624b4f81cdda7f4.tar.gz podman-a6caae0b5a40ae1ccf536e916624b4f81cdda7f4.tar.bz2 podman-a6caae0b5a40ae1ccf536e916624b4f81cdda7f4.zip | |
Merge pull request #5808 from baude/v2psformat2
v2podman ps revert structure changes
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 fb75a03d9..f59d4eb0a 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.ContainerState == define.ContainerStateRunning.String() { + if c.State == 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.ContainerState == define.ContainerStateExited.String() { + if c.State == define.ContainerStateExited.String() { ctrs = append(ctrs, c) } } diff --git a/pkg/domain/infra/tunnel/helpers.go b/pkg/domain/infra/tunnel/helpers.go index 4d7e45897..682d60d6a 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.ContainerNames) { + if id == con.ID || strings.HasPrefix(con.ID, id) || util.StringInSlice(id, con.Names) { cons = append(cons, con) found = true break |