diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-03-19 10:05:10 -0500 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-03-19 10:05:10 -0500 |
| commit | d375424854b93e208c9605a2f1612a88db5035ec (patch) | |
| tree | aea09103eb424371d2126c692f8d3a820a996856 | |
| parent | e87fe4dbbbc55be42d7a31f5415f55d2ff99f81b (diff) | |
| download | podman-d375424854b93e208c9605a2f1612a88db5035ec.tar.gz podman-d375424854b93e208c9605a2f1612a88db5035ec.tar.bz2 podman-d375424854b93e208c9605a2f1612a88db5035ec.zip | |
fix reported compat issues
honor -1 in in list containers for compatibility mode. it is commonly used to indicate no limit.
change the json id parameter to Id in container create.
Fixes: #5553
Signed-off-by: Brent Baude <bbaude@redhat.com>
| -rw-r--r-- | pkg/api/handlers/compat/containers.go | 2 | ||||
| -rw-r--r-- | pkg/api/handlers/utils/containers.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go index 1298e7fa4..e7031f471 100644 --- a/pkg/api/handlers/compat/containers.go +++ b/pkg/api/handlers/compat/containers.go @@ -87,7 +87,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) { utils.InternalServerError(w, err) return } - if _, found := r.URL.Query()["limit"]; found { + if _, found := r.URL.Query()["limit"]; found && query.Limit != -1 { last := query.Limit if len(containers) > last { containers = containers[len(containers)-last:] diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go index d5a79bdc8..bbe4cee3c 100644 --- a/pkg/api/handlers/utils/containers.go +++ b/pkg/api/handlers/utils/containers.go @@ -16,7 +16,7 @@ import ( // ContainerCreateResponse is the response struct for creating a container type ContainerCreateResponse struct { // ID of the container created - ID string `json:"id"` + ID string `json:"Id"` // Warnings during container creation Warnings []string `json:"Warnings"` } |