mirror of
https://github.com/moby/moby.git
synced 2025-10-21 10:33:56 +03:00
Commit [moby@17d870b] (API v1.13, docker v1.1.0) changed the default to pause containers during commit, keeping the behavior opt-in for older API versions. This version-gate was removed in [moby@1b1147e] because API versions lower than v1.23 were no longer supported. However, the client still required opting-in to pausing containers, which is handled by setting the `Pause` field to true by default. This patch changes the client option to reflect the default; after this change, we should also consider changing the API make disabling pause a more explicit option, and to change the "pause" argument to a "no-pause". [moby@17d870b]:17d870bed5
[moby@1b1147e]:1b1147e46b
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
71 lines
1.8 KiB
Go
71 lines
1.8 KiB
Go
package client
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"net/url"
|
|
|
|
"github.com/distribution/reference"
|
|
"github.com/moby/moby/api/types/container"
|
|
)
|
|
|
|
// ContainerCommitOptions holds parameters to commit changes into a container.
|
|
type ContainerCommitOptions struct {
|
|
Reference string
|
|
Comment string
|
|
Author string
|
|
Changes []string
|
|
NoPause bool // NoPause disables pausing the container during commit.
|
|
Config *container.Config
|
|
}
|
|
|
|
// ContainerCommit applies changes to a container and creates a new tagged image.
|
|
func (cli *Client) ContainerCommit(ctx context.Context, containerID string, options ContainerCommitOptions) (container.CommitResponse, error) {
|
|
containerID, err := trimID("container", containerID)
|
|
if err != nil {
|
|
return container.CommitResponse{}, err
|
|
}
|
|
|
|
var repository, tag string
|
|
if options.Reference != "" {
|
|
ref, err := reference.ParseNormalizedNamed(options.Reference)
|
|
if err != nil {
|
|
return container.CommitResponse{}, err
|
|
}
|
|
|
|
if _, ok := ref.(reference.Digested); ok {
|
|
return container.CommitResponse{}, 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 = ref.Name()
|
|
}
|
|
|
|
query := url.Values{}
|
|
query.Set("container", containerID)
|
|
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.NoPause {
|
|
query.Set("pause", "0")
|
|
}
|
|
|
|
var response container.CommitResponse
|
|
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
|
|
}
|