aboutsummaryrefslogtreecommitdiff
path: root/pkg/ps/ps.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-12-15 15:43:11 +0100
committerGitHub <noreply@github.com>2021-12-15 15:43:11 +0100
commit9212c74ff180ee6090a1d4ff77999c19b613c7b6 (patch)
tree87ea90a403b1cb290272025ac67867cb27597505 /pkg/ps/ps.go
parent7dabcbd7bcf78f3b5d310ed547801106da382618 (diff)
parent51a4bef2e62b500457bcd473a1d97ca150f4d1b4 (diff)
downloadpodman-9212c74ff180ee6090a1d4ff77999c19b613c7b6.tar.gz
podman-9212c74ff180ee6090a1d4ff77999c19b613c7b6.tar.bz2
podman-9212c74ff180ee6090a1d4ff77999c19b613c7b6.zip
Merge pull request #12600 from rhatdan/external
Show --external containers even without --all option
Diffstat (limited to 'pkg/ps/ps.go')
-rw-r--r--pkg/ps/ps.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go
index 391bd54d6..a1d77e785 100644
--- a/pkg/ps/ps.go
+++ b/pkg/ps/ps.go
@@ -74,7 +74,7 @@ func GetContainerLists(runtime *libpod.Runtime, options entities.ContainerListOp
}
}
- if options.All && options.External {
+ if options.External {
listCon, err := GetExternalContainerLists(runtime)
if err != nil {
return nil, err