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>
36 lines
920 B
Go
36 lines
920 B
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
)
|
|
|
|
// ContainersPrune requests the daemon to delete unused data
|
|
func (cli *Client) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error) {
|
|
var report types.ContainersPruneReport
|
|
|
|
if err := cli.NewVersionError("1.25", "container prune"); err != nil {
|
|
return report, err
|
|
}
|
|
|
|
query, err := getFiltersQuery(pruneFilters)
|
|
if err != nil {
|
|
return report, err
|
|
}
|
|
|
|
serverResp, err := cli.post(ctx, "/containers/prune", query, nil, nil)
|
|
defer ensureReaderClosed(serverResp)
|
|
if err != nil {
|
|
return report, err
|
|
}
|
|
|
|
if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
|
|
return report, fmt.Errorf("Error retrieving disk usage: %v", err)
|
|
}
|
|
|
|
return report, nil
|
|
}
|