summaryrefslogtreecommitdiff
path: root/pkg/api/handlers/libpod/containers.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-28 20:12:08 -0400
committerGitHub <noreply@github.com>2020-05-28 20:12:08 -0400
commitcd1e25f5d57059a50e8aeae5b640c2d282e70f96 (patch)
treec5fe7993722f72f96b2f49b1ce47e2bb99adc531 /pkg/api/handlers/libpod/containers.go
parente8818ced806910f8ce44939fef08f89139be4119 (diff)
parent5626c2163bff661540e1ae3a5df25f0c7e7573f6 (diff)
downloadpodman-cd1e25f5d57059a50e8aeae5b640c2d282e70f96.tar.gz
podman-cd1e25f5d57059a50e8aeae5b640c2d282e70f96.tar.bz2
podman-cd1e25f5d57059a50e8aeae5b640c2d282e70f96.zip
Merge pull request #6420 from jwhonce/wip/json
V2 verify JSON output is consistent and doesn't drift
Diffstat (limited to 'pkg/api/handlers/libpod/containers.go')
-rw-r--r--pkg/api/handlers/libpod/containers.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
index 3902bdc9b..50f6b1a38 100644
--- a/pkg/api/handlers/libpod/containers.go
+++ b/pkg/api/handlers/libpod/containers.go
@@ -66,6 +66,10 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
utils.InternalServerError(w, err)
return
}
+ if len(pss) == 0 {
+ utils.WriteResponse(w, http.StatusOK, "[]")
+ return
+ }
utils.WriteResponse(w, http.StatusOK, pss)
}