2014-02-25 11:17:48 -05:00
|
|
|
package main
|
|
|
|
|
|
|
|
import (
|
2014-04-17 22:24:19 -04:00
|
|
|
"strings"
|
2015-04-18 12:46:47 -04:00
|
|
|
|
|
|
|
"github.com/go-check/check"
|
2014-02-25 11:17:48 -05:00
|
|
|
)
|
|
|
|
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestCommitAfterContainerIsDone(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-07-14 02:35:36 -04:00
|
|
|
out, _ := dockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")
|
2014-02-25 11:17:48 -05:00
|
|
|
|
2015-04-06 09:21:18 -04:00
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
2014-02-25 11:17:48 -05:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "wait", cleanedContainerID)
|
2014-02-25 11:17:48 -05:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
out, _ = dockerCmd(c, "commit", cleanedContainerID)
|
2014-02-25 11:17:48 -05:00
|
|
|
|
2015-04-06 09:21:18 -04:00
|
|
|
cleanedImageID := strings.TrimSpace(out)
|
2014-02-25 11:17:48 -05:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "inspect", cleanedImageID)
|
2014-06-08 02:37:31 -04:00
|
|
|
}
|
|
|
|
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestCommitWithoutPause(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-07-14 02:35:36 -04:00
|
|
|
out, _ := dockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")
|
2014-06-08 02:37:31 -04:00
|
|
|
|
2015-04-06 09:21:18 -04:00
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
2014-06-08 02:37:31 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "wait", cleanedContainerID)
|
2014-06-08 02:37:31 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
out, _ = dockerCmd(c, "commit", "-p=false", cleanedContainerID)
|
2014-06-08 02:37:31 -04:00
|
|
|
|
2015-04-06 09:21:18 -04:00
|
|
|
cleanedImageID := strings.TrimSpace(out)
|
2014-06-08 02:37:31 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "inspect", cleanedImageID)
|
2014-02-25 11:17:48 -05:00
|
|
|
}
|
2014-04-17 22:24:19 -04:00
|
|
|
|
2015-02-24 06:28:40 -05:00
|
|
|
//test commit a paused container should not unpause it after commit
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestCommitPausedContainer(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-02-24 06:28:40 -05:00
|
|
|
defer unpauseAllContainers()
|
2015-07-14 02:35:36 -04:00
|
|
|
out, _ := dockerCmd(c, "run", "-i", "-d", "busybox")
|
2015-02-24 06:28:40 -05:00
|
|
|
|
2015-04-06 09:21:18 -04:00
|
|
|
cleanedContainerID := strings.TrimSpace(out)
|
2015-02-24 06:28:40 -05:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "pause", cleanedContainerID)
|
|
|
|
|
|
|
|
out, _ = dockerCmd(c, "commit", cleanedContainerID)
|
2015-02-24 06:28:40 -05:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
out, err := inspectField(cleanedContainerID, "State.Paused")
|
2015-05-17 22:06:13 -04:00
|
|
|
c.Assert(err, check.IsNil)
|
2015-02-24 06:28:40 -05:00
|
|
|
if !strings.Contains(out, "true") {
|
2015-04-18 12:46:47 -04:00
|
|
|
c.Fatalf("commit should not unpause a paused container")
|
2015-02-24 06:28:40 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestCommitNewFile(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "run", "--name", "commiter", "busybox", "/bin/sh", "-c", "echo koye > /foo")
|
2014-04-17 22:24:19 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
imageID, _ := dockerCmd(c, "commit", "commiter")
|
2014-10-06 10:26:55 -04:00
|
|
|
imageID = strings.Trim(imageID, "\r\n")
|
2014-04-17 22:24:19 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
out, _ := dockerCmd(c, "run", imageID, "cat", "/foo")
|
2014-04-17 22:24:19 -04:00
|
|
|
|
|
|
|
if actual := strings.Trim(out, "\r\n"); actual != "koye" {
|
2015-04-18 12:46:47 -04:00
|
|
|
c.Fatalf("expected output koye received %q", actual)
|
2014-04-17 22:24:19 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2014-03-27 15:16:03 -04:00
|
|
|
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestCommitHardlink(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-07-14 02:35:36 -04:00
|
|
|
firstOutput, _ := dockerCmd(c, "run", "-t", "--name", "hardlinks", "busybox", "sh", "-c", "touch file1 && ln file1 file2 && ls -di file1 file2")
|
2014-09-15 14:45:53 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
chunks := strings.Split(strings.TrimSpace(firstOutput), " ")
|
2014-09-15 14:45:53 -04:00
|
|
|
inode := chunks[0]
|
|
|
|
found := false
|
|
|
|
for _, chunk := range chunks[1:] {
|
|
|
|
if chunk == inode {
|
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !found {
|
2015-04-18 12:46:47 -04:00
|
|
|
c.Fatalf("Failed to create hardlink in a container. Expected to find %q in %q", inode, chunks[1:])
|
2014-09-15 14:45:53 -04:00
|
|
|
}
|
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
imageID, _ := dockerCmd(c, "commit", "hardlinks", "hardlinks")
|
2014-09-15 14:45:53 -04:00
|
|
|
imageID = strings.Trim(imageID, "\r\n")
|
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
secondOutput, _ := dockerCmd(c, "run", "-t", "hardlinks", "ls", "-di", "file1", "file2")
|
2014-09-15 14:45:53 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
chunks = strings.Split(strings.TrimSpace(secondOutput), " ")
|
2014-09-15 14:45:53 -04:00
|
|
|
inode = chunks[0]
|
|
|
|
found = false
|
|
|
|
for _, chunk := range chunks[1:] {
|
|
|
|
if chunk == inode {
|
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !found {
|
2015-04-18 12:46:47 -04:00
|
|
|
c.Fatalf("Failed to create hardlink in a container. Expected to find %q in %q", inode, chunks[1:])
|
2014-09-15 14:45:53 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestCommitTTY(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "run", "-t", "--name", "tty", "busybox", "/bin/ls")
|
2014-03-27 15:16:03 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
imageID, _ := dockerCmd(c, "commit", "tty", "ttytest")
|
2014-10-06 10:26:55 -04:00
|
|
|
imageID = strings.Trim(imageID, "\r\n")
|
2014-03-27 15:16:03 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "run", "ttytest", "/bin/ls")
|
2014-08-28 01:25:57 -04:00
|
|
|
|
2014-03-27 15:16:03 -04:00
|
|
|
}
|
2014-05-19 18:57:29 -04:00
|
|
|
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestCommitWithHostBindMount(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "run", "--name", "bind-commit", "-v", "/dev/null:/winning", "busybox", "true")
|
2014-10-14 14:26:53 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
imageID, _ := dockerCmd(c, "commit", "bind-commit", "bindtest")
|
2014-10-06 10:26:55 -04:00
|
|
|
imageID = strings.Trim(imageID, "\r\n")
|
2014-05-19 18:57:29 -04:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "run", "bindtest", "true")
|
2014-05-19 18:57:29 -04:00
|
|
|
|
|
|
|
}
|
2014-10-01 05:35:44 -04:00
|
|
|
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestCommitChange(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-07-14 02:35:36 -04:00
|
|
|
dockerCmd(c, "run", "--name", "test", "busybox", "true")
|
2015-02-05 06:26:05 -05:00
|
|
|
|
2015-07-14 02:35:36 -04:00
|
|
|
imageID, _ := dockerCmd(c, "commit",
|
2014-10-01 05:35:44 -04:00
|
|
|
"--change", "EXPOSE 8080",
|
|
|
|
"--change", "ENV DEBUG true",
|
2015-01-12 14:52:44 -05:00
|
|
|
"--change", "ENV test 1",
|
2015-02-25 03:04:46 -05:00
|
|
|
"--change", "ENV PATH /foo",
|
2015-06-04 09:47:55 -04:00
|
|
|
"--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",
|
2014-10-01 05:35:44 -04:00
|
|
|
"test", "test-commit")
|
2015-07-14 02:35:36 -04:00
|
|
|
imageID = strings.Trim(imageID, "\r\n")
|
2014-10-01 05:35:44 -04:00
|
|
|
|
|
|
|
expected := map[string]string{
|
2015-03-26 15:43:00 -04:00
|
|
|
"Config.ExposedPorts": "map[8080/tcp:{}]",
|
2015-02-25 03:04:46 -05:00
|
|
|
"Config.Env": "[DEBUG=true test=1 PATH=/foo]",
|
2015-06-04 09:47:55 -04:00
|
|
|
"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]",
|
2014-10-01 05:35:44 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
for conf, value := range expected {
|
2015-07-14 02:35:36 -04:00
|
|
|
res, err := inspectField(imageID, conf)
|
2015-05-17 22:06:13 -04:00
|
|
|
c.Assert(err, check.IsNil)
|
2014-10-01 05:35:44 -04:00
|
|
|
if res != value {
|
2015-04-18 12:46:47 -04:00
|
|
|
c.Errorf("%s('%s'), expected %s", conf, res, value)
|
2014-10-01 05:35:44 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2015-04-10 17:01:40 -04:00
|
|
|
|
|
|
|
// TODO: commit --run is deprecated, remove this once --run is removed
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestCommitMergeConfigRun(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-04-10 17:01:40 -04:00
|
|
|
name := "commit-test"
|
2015-04-18 12:46:47 -04:00
|
|
|
out, _ := dockerCmd(c, "run", "-d", "-e=FOO=bar", "busybox", "/bin/sh", "-c", "echo testing > /tmp/foo")
|
2015-04-10 17:01:40 -04:00
|
|
|
id := strings.TrimSpace(out)
|
|
|
|
|
2015-04-18 12:46:47 -04:00
|
|
|
dockerCmd(c, "commit", `--run={"Cmd": ["cat", "/tmp/foo"]}`, id, "commit-test")
|
2015-04-10 17:01:40 -04:00
|
|
|
|
2015-04-18 12:46:47 -04:00
|
|
|
out, _ = dockerCmd(c, "run", "--name", name, "commit-test")
|
2015-04-10 17:01:40 -04:00
|
|
|
if strings.TrimSpace(out) != "testing" {
|
2015-04-27 16:33:30 -04:00
|
|
|
c.Fatal("run config in committed container was not merged")
|
2015-04-10 17:01:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
type cfg struct {
|
|
|
|
Env []string
|
|
|
|
Cmd []string
|
|
|
|
}
|
|
|
|
config1 := cfg{}
|
|
|
|
if err := inspectFieldAndMarshall(id, "Config", &config1); err != nil {
|
2015-04-18 12:46:47 -04:00
|
|
|
c.Fatal(err)
|
2015-04-10 17:01:40 -04:00
|
|
|
}
|
|
|
|
config2 := cfg{}
|
|
|
|
if err := inspectFieldAndMarshall(name, "Config", &config2); err != nil {
|
2015-04-18 12:46:47 -04:00
|
|
|
c.Fatal(err)
|
2015-04-10 17:01:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
// 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 != "" {
|
2015-04-18 12:46:47 -04:00
|
|
|
c.Fatalf("expected envs to match: %v - %v", config1.Env, config2.Env)
|
2015-04-10 17:01:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|