3c244d1099
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.
This patch deprecates the `--pause` flag in favor of a `--no-pause` flag to
be more explicit on the default. The old `--pause` flag is marked deprecated
but still functional. Using the deprecated flag will print a warning, and an
error is produced when trying to use both the old and new flag;
docker commit --pause mycontainer
Flag --pause has been deprecated, and enabled by default. Use --no-pause to disable pausing during commit.
docker commit --pause=false mycontainer
Flag --pause has been deprecated, and enabled by default. Use --no-pause to disable pausing during commit.
docker commit --pause --no-pause mycontainer
Flag --pause has been deprecated, use --no-pause instead
conflicting options: --no-pause and --pause cannot be used together
[moby@17d870b]: 17d870bed5
[moby@1b1147e]: 1b1147e46b
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
72 lines
1.7 KiB
Go
72 lines
1.7 KiB
Go
package container
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"testing"
|
|
|
|
"github.com/docker/cli/internal/test"
|
|
"github.com/moby/moby/api/types/container"
|
|
"github.com/moby/moby/client"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestRunCommit(t *testing.T) {
|
|
cli := test.NewFakeCli(&fakeClient{
|
|
containerCommitFunc: func(
|
|
ctx context.Context,
|
|
ctr string,
|
|
options client.ContainerCommitOptions,
|
|
) (container.CommitResponse, error) {
|
|
assert.Check(t, is.Equal(options.Author, "Author Name <author@name.com>"))
|
|
assert.Check(t, is.DeepEqual(options.Changes, []string{"EXPOSE 80"}))
|
|
assert.Check(t, is.Equal(options.Comment, "commit message"))
|
|
assert.Check(t, is.Equal(options.Pause, false))
|
|
assert.Check(t, is.Equal(ctr, "container-id"))
|
|
|
|
return container.CommitResponse{ID: "image-id"}, nil
|
|
},
|
|
})
|
|
|
|
cmd := newCommitCommand(cli)
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetArgs(
|
|
[]string{
|
|
"--author", "Author Name <author@name.com>",
|
|
"--change", "EXPOSE 80",
|
|
"--message", "commit message",
|
|
"--no-pause",
|
|
"container-id",
|
|
},
|
|
)
|
|
|
|
err := cmd.Execute()
|
|
assert.NilError(t, err)
|
|
|
|
assert.Assert(t, is.Equal(cli.OutBuffer().String(), "image-id\n"))
|
|
}
|
|
|
|
func TestRunCommitClientError(t *testing.T) {
|
|
clientError := errors.New("client error")
|
|
|
|
cli := test.NewFakeCli(&fakeClient{
|
|
containerCommitFunc: func(
|
|
ctx context.Context,
|
|
ctr string,
|
|
options client.ContainerCommitOptions,
|
|
) (container.CommitResponse, error) {
|
|
return container.CommitResponse{}, clientError
|
|
},
|
|
})
|
|
|
|
cmd := newCommitCommand(cli)
|
|
cmd.SetOut(io.Discard)
|
|
cmd.SetErr(io.Discard)
|
|
cmd.SetArgs([]string{"container-id"})
|
|
|
|
err := cmd.Execute()
|
|
assert.ErrorIs(t, err, clientError)
|
|
}
|