2014-02-25 11:17:48 -05:00
|
|
|
package main
|
|
|
|
|
|
|
|
import (
|
|
|
|
"strings"
|
2016-10-28 15:21:54 -04:00
|
|
|
"time"
|
2015-04-18 12:46:47 -04:00
|
|
|
|
2016-12-30 12:23:00 -05:00
|
|
|
"github.com/docker/docker/integration-cli/checker"
|
2017-04-11 15:18:30 -04:00
|
|
|
"github.com/docker/docker/integration-cli/cli"
|
2015-04-18 12:46:47 -04:00
|
|
|
"github.com/go-check/check"
|
2014-02-25 11:17:48 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
// ensure that an added file shows up in docker diff
|
2015-04-18 12:46:47 -04:00
|
|
|
func (s *DockerSuite) TestDiffFilenameShownInOutput(c *check.C) {
|
2016-10-28 15:21:54 -04:00
|
|
|
containerCmd := `mkdir /foo; echo xyzzy > /foo/bar`
|
2017-04-11 15:18:30 -04:00
|
|
|
out := cli.DockerCmd(c, "run", "-d", "busybox", "sh", "-c", containerCmd).Combined()
|
2014-02-25 11:17:48 -05:00
|
|
|
|
2016-10-28 15:21:54 -04:00
|
|
|
// Wait for it to exit as cannot diff a running container on Windows, and
|
|
|
|
// it will take a few seconds to exit. Also there's no way in Windows to
|
|
|
|
// differentiate between an Add or a Modify, and all files are under
|
|
|
|
// a "Files/" prefix.
|
|
|
|
containerID := strings.TrimSpace(out)
|
|
|
|
lookingFor := "A /foo/bar"
|
2017-01-13 11:23:28 -05:00
|
|
|
if testEnv.DaemonPlatform() == "windows" {
|
2017-04-11 15:18:30 -04:00
|
|
|
cli.WaitExited(c, containerID, 60*time.Second)
|
2016-10-28 15:21:54 -04:00
|
|
|
lookingFor = "C Files/foo/bar"
|
|
|
|
}
|
|
|
|
|
2015-04-06 09:21:18 -04:00
|
|
|
cleanCID := strings.TrimSpace(out)
|
2017-04-11 15:18:30 -04:00
|
|
|
out = cli.DockerCmd(c, "diff", cleanCID).Combined()
|
2014-02-25 11:17:48 -05:00
|
|
|
|
|
|
|
found := false
|
|
|
|
for _, line := range strings.Split(out, "\n") {
|
2016-10-28 15:21:54 -04:00
|
|
|
if strings.Contains(line, lookingFor) {
|
2014-02-25 11:17:48 -05:00
|
|
|
found = true
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
2015-10-19 05:31:02 -04:00
|
|
|
c.Assert(found, checker.True)
|
2014-02-25 11:17:48 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// test to ensure GH #3840 doesn't occur any more
|
2016-01-20 06:53:54 -05:00
|
|
|
func (s *DockerSuite) TestDiffEnsureInitLayerFilesAreIgnored(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2014-02-25 11:17:48 -05:00
|
|
|
// this is a list of files which shouldn't show up in `docker diff`
|
2016-01-20 06:53:54 -05:00
|
|
|
initLayerFiles := []string{"/etc/resolv.conf", "/etc/hostname", "/etc/hosts", "/.dockerenv"}
|
2015-04-23 19:35:13 -04:00
|
|
|
containerCount := 5
|
2014-02-25 11:17:48 -05:00
|
|
|
|
|
|
|
// we might not run into this problem from the first run, so start a few containers
|
2015-04-23 19:35:13 -04:00
|
|
|
for i := 0; i < containerCount; i++ {
|
2014-02-25 11:17:48 -05:00
|
|
|
containerCmd := `echo foo > /root/bar`
|
2015-07-20 02:55:40 -04:00
|
|
|
out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", containerCmd)
|
2014-02-25 11:17:48 -05:00
|
|
|
|
2015-04-06 09:21:18 -04:00
|
|
|
cleanCID := strings.TrimSpace(out)
|
2015-07-20 02:55:40 -04:00
|
|
|
out, _ = dockerCmd(c, "diff", cleanCID)
|
2014-02-25 11:17:48 -05:00
|
|
|
|
2016-01-20 06:53:54 -05:00
|
|
|
for _, filename := range initLayerFiles {
|
2015-10-19 05:31:02 -04:00
|
|
|
c.Assert(out, checker.Not(checker.Contains), filename)
|
2014-02-25 11:17:48 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-04-01 17:07:40 -04:00
|
|
|
|
2016-03-24 06:10:41 -04:00
|
|
|
func (s *DockerSuite) TestDiffEnsureDefaultDevs(c *check.C) {
|
2015-08-28 13:36:42 -04:00
|
|
|
testRequires(c, DaemonIsLinux)
|
2015-07-20 02:55:40 -04:00
|
|
|
out, _ := dockerCmd(c, "run", "-d", "busybox", "sleep", "0")
|
2014-10-14 15:56:13 -04:00
|
|
|
|
2015-04-06 09:21:18 -04:00
|
|
|
cleanCID := strings.TrimSpace(out)
|
2015-07-20 02:55:40 -04:00
|
|
|
out, _ = dockerCmd(c, "diff", cleanCID)
|
2014-04-01 17:07:40 -04:00
|
|
|
|
|
|
|
expected := map[string]bool{
|
2015-01-23 07:17:05 -05:00
|
|
|
"C /dev": true,
|
|
|
|
"A /dev/full": true, // busybox
|
|
|
|
"C /dev/ptmx": true, // libcontainer
|
2015-11-04 14:39:12 -05:00
|
|
|
"A /dev/mqueue": true,
|
|
|
|
"A /dev/kmsg": true,
|
2015-01-23 07:17:05 -05:00
|
|
|
"A /dev/fd": true,
|
|
|
|
"A /dev/ptmx": true,
|
|
|
|
"A /dev/null": true,
|
|
|
|
"A /dev/random": true,
|
|
|
|
"A /dev/stdout": true,
|
|
|
|
"A /dev/stderr": true,
|
|
|
|
"A /dev/tty1": true,
|
|
|
|
"A /dev/stdin": true,
|
|
|
|
"A /dev/tty": true,
|
|
|
|
"A /dev/urandom": true,
|
|
|
|
"A /dev/zero": true,
|
2014-04-01 17:07:40 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
for _, line := range strings.Split(out, "\n") {
|
2016-03-24 06:10:41 -04:00
|
|
|
c.Assert(line == "" || expected[line], checker.True, check.Commentf(line))
|
2014-04-01 17:07:40 -04:00
|
|
|
}
|
|
|
|
}
|
2015-07-08 04:44:48 -04:00
|
|
|
|
|
|
|
// https://github.com/docker/docker/pull/14381#discussion_r33859347
|
|
|
|
func (s *DockerSuite) TestDiffEmptyArgClientError(c *check.C) {
|
2015-07-27 14:13:25 -04:00
|
|
|
out, _, err := dockerCmdWithError("diff", "")
|
2015-10-19 05:31:02 -04:00
|
|
|
c.Assert(err, checker.NotNil)
|
2016-06-06 07:58:29 -04:00
|
|
|
c.Assert(strings.TrimSpace(out), checker.Contains, "Container name cannot be empty")
|
2015-07-08 04:44:48 -04:00
|
|
|
}
|