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>
27 lines
674 B
Go
27 lines
674 B
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"context"
|
|
"net/url"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
)
|
|
|
|
// ContainerRemove kills and removes a container from the docker host.
|
|
func (cli *Client) ContainerRemove(ctx context.Context, containerID string, options types.ContainerRemoveOptions) error {
|
|
query := url.Values{}
|
|
if options.RemoveVolumes {
|
|
query.Set("v", "1")
|
|
}
|
|
if options.RemoveLinks {
|
|
query.Set("link", "1")
|
|
}
|
|
|
|
if options.Force {
|
|
query.Set("force", "1")
|
|
}
|
|
|
|
resp, err := cli.delete(ctx, "/containers/"+containerID, query, nil)
|
|
defer ensureReaderClosed(resp)
|
|
return wrapResponseError(err, resp, "container", containerID)
|
|
}
|