opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 11:32:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5190 from baude/apiv2cockpit3

Browse Source 
filtering behavior correction
This commit is contained in:
OpenShift Merge Robot
2020-02-14 00:32:33 +01:00
committed by GitHub
parent 1b290f995b ce7c9c998c
commit 0c060dace1
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/api/handlers/libpod/containers.go
View File

@ -83,6 +83,8 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
Pod: query.Pod, Pod: query.Pod,
Sync: query.Sync, Sync: query.Sync,
} }
all := query.All
if len(query.Filters) > 0 { if len(query.Filters) > 0 {
for k, v := range query.Filters { for k, v := range query.Filters {
for _, val := range v { for _, val := range v {
@ -96,8 +98,12 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
} }
} }
if !query.All { // Docker thinks that if status is given as an input, then we should override
// The default is get only running containers. Do this with a filterfunc // the all setting and always deal with all containers.
if len(query.Filters["status"]) > 0 {
all = true
}
if !all {
runningOnly, err := shared.GenerateContainerFilterFuncs("status", define.ContainerStateRunning.String(), runtime) runningOnly, err := shared.GenerateContainerFilterFuncs("status", define.ContainerStateRunning.String(), runtime)
if err != nil { if err != nil {
utils.InternalServerError(w, err) utils.InternalServerError(w, err)