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

Merge pull request #7739 from zhangguanzhang/apiv2-containers-limit

Browse Source 
apiv2 /containers/json limit differ from docker-api
This commit is contained in:
OpenShift Merge Robot
2020-09-24 09:43:19 +00:00
committed by GitHub
parent c256944d00 873989f7a4
commit c3d1cefa02
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/handlers/compat/containers.go
View File

@ -85,7 +85,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) {
utils.InternalServerError(w, err) utils.InternalServerError(w, err)
return return
} }
if _, found := r.URL.Query()["limit"]; found && query.Limit != -1 { if _, found := r.URL.Query()["limit"]; found && query.Limit > 0 {
last := query.Limit last := query.Limit
if len(containers) > last { if len(containers) > last {
containers = containers[len(containers)-last:] containers = containers[len(containers)-last:]

25
test/apiv2/20-containers.at
View File

@ -176,6 +176,31 @@ t GET containers/$cid/json 200 \
.Config.Cmd='[]' \ .Config.Cmd='[]' \
.Path="echo" \ .Path="echo" \
.Args[0]="param1" .Args[0]="param1"
# create a running container for after
t POST containers/create '"Image":"'$IMAGE'","Entrypoint":["top"]' 201 \
.Id~[0-9a-f]\\{64\\}
cid_top=$(jq -r '.Id' <<<"$output")
t GET containers/${cid_top}/json 200 \
.Config.Entrypoint[0]="top" \
.Config.Cmd='[]' \
.Path="top"
t POST containers/${cid_top}/start '' 204
# make sure the container is running
t GET containers/${cid_top}/json 200 \
.State.Status="running"
# 0 means unlimited, need same with docker
t GET containers/json?limit=0 200 \
.[0].Id~[0-9a-f]\\{64\\}
t GET 'containers/json?limit=0&all=1' 200 \
.[0].Id~[0-9a-f]\\{64\\} \
.[1].Id~[0-9a-f]\\{64\\}
t POST containers/${cid_top}/stop "" 204
t DELETE containers/$cid 204 t DELETE containers/$cid 204
t DELETE containers/$cid_top 204
# vim: filetype=sh # vim: filetype=sh