toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use image ID if tag has been updated

Browse Source 
Fixes #12595

Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
Upstream-commit: 2167f40a766d1909443695d96bcecc3d039fb482
Component: engine
This commit is contained in:
Travis Thieman
2015-04-30 21:13:18 -04:00
parent a4109bfd5c
commit dd5279c777
2 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
components/engine/integration-cli/docker_cli_ps_test.go
View File

@ -573,3 +573,57 @@ func (s *DockerSuite) TestPsDefaultFormatAndQuiet(c *check.C) {
c.Fatalf("Expected to print only the container id, got %v\n", out)
}
}
// Test for GitHub issue #12595
func (s *DockerSuite) TestPsImageIDAfterUpdate(c *check.C) {
originalImageName := "busybox:TestPsImageIDAfterUpdate-original"
updatedImageName := "busybox:TestPsImageIDAfterUpdate-updated"
runCmd := exec.Command(dockerBinary, "tag", "busybox:latest", originalImageName)
out, _, err := runCommandWithOutput(runCmd)
c.Assert(err, check.IsNil)
originalImageID, err := getIDByName(originalImageName)
c.Assert(err, check.IsNil)
runCmd = exec.Command(dockerBinary, "run", "-d", originalImageName, "top")
out, _, err = runCommandWithOutput(runCmd)
c.Assert(err, check.IsNil)
containerID := strings.TrimSpace(out)
linesOut, err := exec.Command(dockerBinary, "ps", "--no-trunc").CombinedOutput()
c.Assert(err, check.IsNil)
lines := strings.Split(strings.TrimSpace(string(linesOut)), "\n")
// skip header
lines = lines[1:]
c.Assert(len(lines), check.Equals, 1)
for _, line := range lines {
f := strings.Fields(line)
c.Assert(f[1], check.Equals, originalImageName)
}
runCmd = exec.Command(dockerBinary, "commit", containerID, updatedImageName)
out, _, err = runCommandWithOutput(runCmd)
c.Assert(err, check.IsNil)
runCmd = exec.Command(dockerBinary, "tag", "-f", updatedImageName, originalImageName)
out, _, err = runCommandWithOutput(runCmd)
c.Assert(err, check.IsNil)
linesOut, err = exec.Command(dockerBinary, "ps", "--no-trunc").CombinedOutput()
c.Assert(err, check.IsNil)
lines = strings.Split(strings.TrimSpace(string(linesOut)), "\n")
// skip header
lines = lines[1:]
c.Assert(len(lines), check.Equals, 1)
for _, line := range lines {
f := strings.Fields(line)
c.Assert(f[1], check.Equals, originalImageID)
}
}