9c846b2fcc
Unlike a plain `net/http/client.Do()`, requests made through client/request use the `sendRequest` function, which parses the server response, and may convert non-transport errors into errors (through `cli.checkResponseErr()`). This means that we cannot assume that no reader was opened if an error is returned. This patch changes various locations where `ensureReaderClosed` was only called in the non-error situation, and uses a `defer` to make sure it's always called. `ensureReaderClosed` itself already checks if the response's body was set, so in situations where the error was due to a transport error, calling `ensureReaderClosed` should be a no-op. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
56 lines
1.1 KiB
Go
56 lines
1.1 KiB
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"net/url"
|
|
"strconv"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
)
|
|
|
|
// ContainerList returns the list of containers in the docker host.
|
|
func (cli *Client) ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
|
|
query := url.Values{}
|
|
|
|
if options.All {
|
|
query.Set("all", "1")
|
|
}
|
|
|
|
if options.Limit != -1 {
|
|
query.Set("limit", strconv.Itoa(options.Limit))
|
|
}
|
|
|
|
if options.Since != "" {
|
|
query.Set("since", options.Since)
|
|
}
|
|
|
|
if options.Before != "" {
|
|
query.Set("before", options.Before)
|
|
}
|
|
|
|
if options.Size {
|
|
query.Set("size", "1")
|
|
}
|
|
|
|
if options.Filters.Len() > 0 {
|
|
filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
query.Set("filters", filterJSON)
|
|
}
|
|
|
|
resp, err := cli.get(ctx, "/containers/json", query, nil)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
var containers []types.Container
|
|
err = json.NewDecoder(resp.body).Decode(&containers)
|
|
return containers, err
|
|
}
|