Merge pull request #5554 from baude/compatfix

fix reported compat issues
containers · Mar 19, 2020 · b43e249 · b43e249
2 parents 49a7856 + d375424
commit b43e249
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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"`
 }