123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189 |
- package main
- import (
- "strings"
- "github.com/docker/docker/pkg/integration/checker"
- "github.com/go-check/check"
- )
- func (s *DockerSuite) TestCommitAfterContainerIsDone(c *check.C) {
- 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", cleanedContainerID)
- cleanedImageID := strings.TrimSpace(out)
- dockerCmd(c, "inspect", cleanedImageID)
- }
- func (s *DockerSuite) TestCommitWithoutPause(c *check.C) {
- 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)
- }
- //test commit a paused container should not unpause it after commit
- func (s *DockerSuite) TestCommitPausedContainer(c *check.C) {
- testRequires(c, DaemonIsLinux)
- defer unpauseAllContainers()
- out, _ := dockerCmd(c, "run", "-i", "-d", "busybox")
- cleanedContainerID := strings.TrimSpace(out)
- dockerCmd(c, "pause", cleanedContainerID)
- out, _ = dockerCmd(c, "commit", cleanedContainerID)
- out = inspectField(c, cleanedContainerID, "State.Paused")
- // commit should not unpause a paused container
- c.Assert(out, checker.Contains, "true")
- }
- func (s *DockerSuite) TestCommitNewFile(c *check.C) {
- testRequires(c, DaemonIsLinux)
- dockerCmd(c, "run", "--name", "commiter", "busybox", "/bin/sh", "-c", "echo koye > /foo")
- imageID, _ := dockerCmd(c, "commit", "commiter")
- imageID = strings.TrimSpace(imageID)
- out, _ := dockerCmd(c, "run", imageID, "cat", "/foo")
- actual := strings.TrimSpace(out)
- c.Assert(actual, checker.Equals, "koye")
- }
- func (s *DockerSuite) TestCommitHardlink(c *check.C) {
- 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)
- c.Assert(chunks[1], checker.Contains, chunks[0], check.Commentf("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", "hardlinks", "ls", "-di", "file1", "file2")
- chunks = strings.Split(strings.TrimSpace(secondOutput), " ")
- inode = chunks[0]
- chunks = strings.SplitAfterN(strings.TrimSpace(secondOutput), " ", 2)
- c.Assert(chunks[1], checker.Contains, chunks[0], check.Commentf("Failed to create hardlink in a container. Expected to find %q in %q", inode, chunks[1:]))
- }
- func (s *DockerSuite) TestCommitTTY(c *check.C) {
- testRequires(c, DaemonIsLinux)
- dockerCmd(c, "run", "-t", "--name", "tty", "busybox", "/bin/ls")
- imageID, _ := dockerCmd(c, "commit", "tty", "ttytest")
- imageID = strings.TrimSpace(imageID)
- dockerCmd(c, "run", "ttytest", "/bin/ls")
- }
- func (s *DockerSuite) TestCommitWithHostBindMount(c *check.C) {
- 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", "bindtest", "true")
- }
- func (s *DockerSuite) TestCommitChange(c *check.C) {
- testRequires(c, DaemonIsLinux)
- 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)
- expected := map[string]string{
- "Config.ExposedPorts": "map[8080/tcp:{}]",
- "Config.Env": "[DEBUG=true test=1 PATH=/foo]",
- "Config.Labels": "map[foo:bar]",
- "Config.Cmd": "[/bin/sh]",
- "Config.WorkingDir": "/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)
- }
- }
- }
- // TODO: commit --run is deprecated, remove this once --run is removed
- func (s *DockerSuite) TestCommitMergeConfigRun(c *check.C) {
- testRequires(c, DaemonIsLinux)
- name := "commit-test"
- out, _ := dockerCmd(c, "run", "-d", "-e=FOO=bar", "busybox", "/bin/sh", "-c", "echo testing > /tmp/foo")
- id := strings.TrimSpace(out)
- dockerCmd(c, "commit", `--run={"Cmd": ["cat", "/tmp/foo"]}`, id, "commit-test")
- out, _ = dockerCmd(c, "run", "--name", name, "commit-test")
- //run config in committed container was not merged
- c.Assert(strings.TrimSpace(out), checker.Equals, "testing")
- type cfg struct {
- Env []string
- Cmd []string
- }
- config1 := cfg{}
- inspectFieldAndMarshall(c, id, "Config", &config1)
- config2 := cfg{}
- inspectFieldAndMarshall(c, name, "Config", &config2)
- // Env has at least PATH loaded as well here, so let's just grab the FOO one
- var env1, env2 string
- for _, e := range config1.Env {
- if strings.HasPrefix(e, "FOO") {
- env1 = e
- break
- }
- }
- for _, e := range config2.Env {
- if strings.HasPrefix(e, "FOO") {
- env2 = e
- break
- }
- }
- if len(config1.Env) != len(config2.Env) || env1 != env2 && env2 != "" {
- c.Fatalf("expected envs to match: %v - %v", config1.Env, config2.Env)
- }
- }
|