containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show --external containers even without --all option 

We currently do not show --external containers when the user specifies
it, unless they also specify the --all flag. This has led to confusion.
I see no reason not to list them without the --all flag if the user
specifies the option.

Fixes: https://github.com/containers/podman/issues/12353

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh 2021-12-14 16:03:19 -05:00
parent c36fb8b113
commit 51a4bef2e6
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/markdown/podman-ps.1.md
View File

@ -34,7 +34,7 @@ Note: Podman shares containers storage with other tools such as Buildah and CRI-
#### **--external** #### **--external**
Display external containers that are not controlled by Podman but are stored in containers storage. These external containers are generally created via other container technology such as Buildah or CRI-O and may depend on the same container images that Podman is also using. External containers are denoted with either a 'buildah' or 'storage' in the COMMAND and STATUS column of the ps output. Only used with the --all option. Display external containers that are not controlled by Podman but are stored in containers storage. These external containers are generally created via other container technology such as Buildah or CRI-O and may depend on the same container images that Podman is also using. External containers are denoted with either a 'buildah' or 'storage' in the COMMAND and STATUS column of the ps output.
#### **--filter**, **-f** #### **--filter**, **-f**

2
pkg/ps/ps.go
View File

@ -74,7 +74,7 @@ func GetContainerLists(runtime *libpod.Runtime, options entities.ContainerListOp
} }
} }
if options.All && options.External { if options.External {
listCon, err := GetExternalContainerLists(runtime) listCon, err := GetExternalContainerLists(runtime)
if err != nil { if err != nil {
return nil, err return nil, err

12
test/system/040-ps.bats
View File

@ -83,10 +83,10 @@ load helpers
run_podman rm -a run_podman rm -a
} }
@test "podman ps -a --external" { @test "podman ps --external" {
# Setup: ensure that we have no hidden storage containers # Setup: ensure that we have no hidden storage containers
run_podman ps --external -a run_podman ps --external
is "${#lines[@]}" "1" "setup check: no storage containers at start of test" is "${#lines[@]}" "1" "setup check: no storage containers at start of test"
# Force a buildah timeout; this leaves a buildah container behind # Force a buildah timeout; this leaves a buildah container behind
@ -107,7 +107,7 @@ EOF
run_podman ps -a run_podman ps -a
is "${#lines[@]}" "1" "podman ps -a does not see buildah containers" is "${#lines[@]}" "1" "podman ps -a does not see buildah containers"
run_podman ps --external -a run_podman ps --external
is "${#lines[@]}" "3" "podman ps -a --external sees buildah containers" is "${#lines[@]}" "3" "podman ps -a --external sees buildah containers"
is "${lines[1]}" \ is "${lines[1]}" \
"[0-9a-f]\{12\} \+$IMAGE *buildah .* seconds ago .* storage .* ${PODMAN_TEST_IMAGE_NAME}-working-container" \ "[0-9a-f]\{12\} \+$IMAGE *buildah .* seconds ago .* storage .* ${PODMAN_TEST_IMAGE_NAME}-working-container" \
@ -115,7 +115,7 @@ EOF
# 'rm -a' should be a NOP # 'rm -a' should be a NOP
run_podman rm -a run_podman rm -a
run_podman ps --external -a run_podman ps --external
is "${#lines[@]}" "3" "podman ps -a --external sees buildah containers" is "${#lines[@]}" "3" "podman ps -a --external sees buildah containers"
# Cannot prune intermediate image as it's being used by a buildah # Cannot prune intermediate image as it's being used by a buildah
@ -128,7 +128,7 @@ EOF
is "${#lines[@]}" "1" "Image used by build container is pruned" is "${#lines[@]}" "1" "Image used by build container is pruned"
# One buildah container has been removed. # One buildah container has been removed.
run_podman ps --external -a run_podman ps --external
is "${#lines[@]}" "2" "podman ps -a --external sees buildah containers" is "${#lines[@]}" "2" "podman ps -a --external sees buildah containers"
cid="${lines[1]:0:12}" cid="${lines[1]:0:12}"
@ -140,7 +140,7 @@ EOF
# With -f, we can remove it. # With -f, we can remove it.
run_podman rm -t 0 -f "$cid" run_podman rm -t 0 -f "$cid"
run_podman ps --external -a run_podman ps --external
is "${#lines[@]}" "1" "storage container has been removed" is "${#lines[@]}" "1" "storage container has been removed"
} }