e8dc902781
Integration tests will now configure clients to propagate traces as well as create spans for all tests. Some extra changes were needed (or desired for trace propagation) in the test helpers to pass through tracing spans via context. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
181 lines
6.2 KiB
Go
181 lines
6.2 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types/versions"
|
|
"github.com/docker/docker/integration-cli/cli"
|
|
"gotest.tools/v3/assert"
|
|
"gotest.tools/v3/skip"
|
|
)
|
|
|
|
type DockerCLICommitSuite struct {
|
|
ds *DockerSuite
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) TearDownTest(ctx context.Context, c *testing.T) {
|
|
s.ds.TearDownTest(ctx, c)
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) OnTimeout(c *testing.T) {
|
|
s.ds.OnTimeout(c)
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) TestCommitAfterContainerIsDone(c *testing.T) {
|
|
skip.If(c, RuntimeIsWindowsContainerd(), "FIXME: Broken on Windows + containerd combination")
|
|
out := cli.DockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo").Combined()
|
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
cli.DockerCmd(c, "wait", cleanedContainerID)
|
|
|
|
out = cli.DockerCmd(c, "commit", cleanedContainerID).Combined()
|
|
|
|
cleanedImageID := strings.TrimSpace(out)
|
|
|
|
cli.DockerCmd(c, "inspect", cleanedImageID)
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) TestCommitWithoutPause(c *testing.T) {
|
|
testRequires(c, DaemonIsLinux)
|
|
out, _ := dockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")
|
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
dockerCmd(c, "wait", cleanedContainerID)
|
|
|
|
out, _ = dockerCmd(c, "commit", "-p=false", cleanedContainerID)
|
|
|
|
cleanedImageID := strings.TrimSpace(out)
|
|
|
|
dockerCmd(c, "inspect", cleanedImageID)
|
|
}
|
|
|
|
// TestCommitPausedContainer tests that a paused container is not unpaused after being committed
|
|
func (s *DockerCLICommitSuite) TestCommitPausedContainer(c *testing.T) {
|
|
testRequires(c, DaemonIsLinux)
|
|
out, _ := dockerCmd(c, "run", "-i", "-d", "busybox")
|
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
dockerCmd(c, "pause", cleanedContainerID)
|
|
dockerCmd(c, "commit", cleanedContainerID)
|
|
|
|
out = inspectField(c, cleanedContainerID, "State.Paused")
|
|
// commit should not unpause a paused container
|
|
assert.Assert(c, strings.Contains(out, "true"))
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) TestCommitNewFile(c *testing.T) {
|
|
dockerCmd(c, "run", "--name", "committer", "busybox", "/bin/sh", "-c", "echo koye > /foo")
|
|
|
|
imageID, _ := dockerCmd(c, "commit", "committer")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
out, _ := dockerCmd(c, "run", imageID, "cat", "/foo")
|
|
actual := strings.TrimSpace(out)
|
|
assert.Equal(c, actual, "koye")
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) TestCommitHardlink(c *testing.T) {
|
|
testRequires(c, DaemonIsLinux)
|
|
firstOutput, _ := dockerCmd(c, "run", "-t", "--name", "hardlinks", "busybox", "sh", "-c", "touch file1 && ln file1 file2 && ls -di file1 file2")
|
|
|
|
chunks := strings.Split(strings.TrimSpace(firstOutput), " ")
|
|
inode := chunks[0]
|
|
chunks = strings.SplitAfterN(strings.TrimSpace(firstOutput), " ", 2)
|
|
assert.Assert(c, strings.Contains(chunks[1], chunks[0]), "Failed to create hardlink in a container. Expected to find %q in %q", inode, chunks[1:])
|
|
imageID, _ := dockerCmd(c, "commit", "hardlinks", "hardlinks")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
secondOutput, _ := dockerCmd(c, "run", "-t", imageID, "ls", "-di", "file1", "file2")
|
|
|
|
chunks = strings.Split(strings.TrimSpace(secondOutput), " ")
|
|
inode = chunks[0]
|
|
chunks = strings.SplitAfterN(strings.TrimSpace(secondOutput), " ", 2)
|
|
assert.Assert(c, strings.Contains(chunks[1], chunks[0]), "Failed to create hardlink in a container. Expected to find %q in %q", inode, chunks[1:])
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) TestCommitTTY(c *testing.T) {
|
|
dockerCmd(c, "run", "-t", "--name", "tty", "busybox", "/bin/ls")
|
|
|
|
imageID, _ := dockerCmd(c, "commit", "tty", "ttytest")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
dockerCmd(c, "run", imageID, "/bin/ls")
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) TestCommitWithHostBindMount(c *testing.T) {
|
|
testRequires(c, DaemonIsLinux)
|
|
dockerCmd(c, "run", "--name", "bind-commit", "-v", "/dev/null:/winning", "busybox", "true")
|
|
|
|
imageID, _ := dockerCmd(c, "commit", "bind-commit", "bindtest")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
dockerCmd(c, "run", imageID, "true")
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) TestCommitChange(c *testing.T) {
|
|
dockerCmd(c, "run", "--name", "test", "busybox", "true")
|
|
|
|
imageID, _ := dockerCmd(c, "commit",
|
|
"--change", `EXPOSE 8080`,
|
|
"--change", `ENV DEBUG true`,
|
|
"--change", `ENV test 1`,
|
|
"--change", `ENV PATH /foo`,
|
|
"--change", `LABEL foo bar`,
|
|
"--change", `CMD ["/bin/sh"]`,
|
|
"--change", `WORKDIR /opt`,
|
|
"--change", `ENTRYPOINT ["/bin/sh"]`,
|
|
"--change", `USER testuser`,
|
|
"--change", `VOLUME /var/lib/docker`,
|
|
"--change", `ONBUILD /usr/local/bin/python-build --dir /app/src`,
|
|
"test", "test-commit")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
expectedEnv := "[DEBUG=true test=1 PATH=/foo]"
|
|
// bug fixed in 1.36, add min APi >= 1.36 requirement
|
|
// PR record https://github.com/moby/moby/pull/35582
|
|
if versions.GreaterThan(testEnv.DaemonAPIVersion(), "1.35") && testEnv.DaemonInfo.OSType != "windows" {
|
|
// The ordering here is due to `PATH` being overridden from the container's
|
|
// ENV. On windows, the container doesn't have a `PATH` ENV variable so
|
|
// the ordering is the same as the cli.
|
|
expectedEnv = "[PATH=/foo DEBUG=true test=1]"
|
|
}
|
|
|
|
prefix, slash := getPrefixAndSlashFromDaemonPlatform()
|
|
prefix = strings.ToUpper(prefix) // Force C: as that's how WORKDIR is normalized on Windows
|
|
expected := map[string]string{
|
|
"Config.ExposedPorts": "map[8080/tcp:{}]",
|
|
"Config.Env": expectedEnv,
|
|
"Config.Labels": "map[foo:bar]",
|
|
"Config.Cmd": "[/bin/sh]",
|
|
"Config.WorkingDir": prefix + slash + "opt",
|
|
"Config.Entrypoint": "[/bin/sh]",
|
|
"Config.User": "testuser",
|
|
"Config.Volumes": "map[/var/lib/docker:{}]",
|
|
"Config.OnBuild": "[/usr/local/bin/python-build --dir /app/src]",
|
|
}
|
|
|
|
for conf, value := range expected {
|
|
res := inspectField(c, imageID, conf)
|
|
if res != value {
|
|
c.Errorf("%s('%s'), expected %s", conf, res, value)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (s *DockerCLICommitSuite) TestCommitChangeLabels(c *testing.T) {
|
|
dockerCmd(c, "run", "--name", "test", "--label", "some=label", "busybox", "true")
|
|
|
|
imageID, _ := dockerCmd(c, "commit",
|
|
"--change", "LABEL some=label2",
|
|
"test", "test-commit")
|
|
imageID = strings.TrimSpace(imageID)
|
|
|
|
assert.Equal(c, inspectField(c, imageID, "Config.Labels"), "map[some:label2]")
|
|
// check that container labels didn't change
|
|
assert.Equal(c, inspectField(c, "test", "Config.Labels"), "map[some:label]")
|
|
}
|