mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
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>
55 lines
1.5 KiB
Go
55 lines
1.5 KiB
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/url"
|
|
|
|
"github.com/docker/distribution/reference"
|
|
"github.com/docker/docker/api/types"
|
|
)
|
|
|
|
// ContainerCommit applies changes into a container and creates a new tagged image.
|
|
func (cli *Client) ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.IDResponse, error) {
|
|
var repository, tag string
|
|
if options.Reference != "" {
|
|
ref, err := reference.ParseNormalizedNamed(options.Reference)
|
|
if err != nil {
|
|
return types.IDResponse{}, err
|
|
}
|
|
|
|
if _, isCanonical := ref.(reference.Canonical); isCanonical {
|
|
return types.IDResponse{}, errors.New("refusing to create a tag with a digest reference")
|
|
}
|
|
ref = reference.TagNameOnly(ref)
|
|
|
|
if tagged, ok := ref.(reference.Tagged); ok {
|
|
tag = tagged.Tag()
|
|
}
|
|
repository = reference.FamiliarName(ref)
|
|
}
|
|
|
|
query := url.Values{}
|
|
query.Set("container", container)
|
|
query.Set("repo", repository)
|
|
query.Set("tag", tag)
|
|
query.Set("comment", options.Comment)
|
|
query.Set("author", options.Author)
|
|
for _, change := range options.Changes {
|
|
query.Add("changes", change)
|
|
}
|
|
if !options.Pause {
|
|
query.Set("pause", "0")
|
|
}
|
|
|
|
var response types.IDResponse
|
|
resp, err := cli.post(ctx, "/commit", query, options.Config, nil)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return response, err
|
|
}
|
|
|
|
err = json.NewDecoder(resp.body).Decode(&response)
|
|
return response, err
|
|
}
|