clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 13:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow go template to work properly with inspect

Browse Source 
Closes #11641

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
This commit is contained in:
Srini Brahmaroutu
2015-04-23 18:25:18 +00:00
committed by Srini Brahmaroutu
parent eae272f90e
commit 231d362db7
8 changed files with 120 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_build_test.go
+15 -14
View File
@@ -2350,7 +2350,7 @@ func (s *DockerSuite) TestBuildContextCleanupFailedBuild(c *check.C) {
func (s *DockerSuite) TestBuildCmd(c *check.C) {
name := "testbuildcmd"
expected := "[/bin/echo Hello World]"
expected := "{[/bin/echo Hello World]}"
defer deleteImages(name)
_, err := buildImage(name,
`FROM scratch
@@ -2370,7 +2370,7 @@ func (s *DockerSuite) TestBuildCmd(c *check.C) {
func (s *DockerSuite) TestBuildExpose(c *check.C) {
name := "testbuildexpose"
expected := "map[2375/tcp:map[]]"
expected := "map[2375/tcp:{}]"
defer deleteImages(name)
_, err := buildImage(name,
`FROM scratch
@@ -2467,7 +2467,7 @@ func (s *DockerSuite) TestBuildExposeOrder(c *check.C) {
func (s *DockerSuite) TestBuildExposeUpperCaseProto(c *check.C) {
name := "testbuildexposeuppercaseproto"
expected := "map[5678/udp:map[]]"
expected := "map[5678/udp:{}]"
defer deleteImages(name)
_, err := buildImage(name,
`FROM scratch
@@ -2488,7 +2488,7 @@ func (s *DockerSuite) TestBuildExposeUpperCaseProto(c *check.C) {
func (s *DockerSuite) TestBuildExposeHostPort(c *check.C) {
// start building docker file with ip:hostPort:containerPort
name := "testbuildexpose"
expected := "map[5678/tcp:map[]]"
expected := "map[5678/tcp:{}]"
defer deleteImages(name)
_, out, err := buildImageWithOut(name,
`FROM scratch
@@ -2528,7 +2528,7 @@ func (s *DockerSuite) TestBuildEmptyEntrypointInheritance(c *check.C) {
c.Fatal(err)
}
expected := "[/bin/echo]"
expected := "{[/bin/echo]}"
if res != expected {
c.Fatalf("Entrypoint %s, expected %s", res, expected)
}
@@ -2545,7 +2545,7 @@ func (s *DockerSuite) TestBuildEmptyEntrypointInheritance(c *check.C) {
c.Fatal(err)
}
expected = "[]"
expected = "{[]}"
if res != expected {
c.Fatalf("Entrypoint %s, expected %s", res, expected)
@@ -2556,7 +2556,7 @@ func (s *DockerSuite) TestBuildEmptyEntrypointInheritance(c *check.C) {
func (s *DockerSuite) TestBuildEmptyEntrypoint(c *check.C) {
name := "testbuildentrypoint"
defer deleteImages(name)
expected := "[]"
expected := "{[]}"
_, err := buildImage(name,
`FROM busybox
@@ -2577,7 +2577,7 @@ func (s *DockerSuite) TestBuildEmptyEntrypoint(c *check.C) {
func (s *DockerSuite) TestBuildEntrypoint(c *check.C) {
name := "testbuildentrypoint"
expected := "[/bin/echo]"
expected := "{[/bin/echo]}"
defer deleteImages(name)
_, err := buildImage(name,
`FROM scratch
@@ -3297,8 +3297,8 @@ func (s *DockerSuite) TestBuildEntrypointRunCleanup(c *check.C) {
c.Fatal(err)
}
// Cmd must be cleaned up
if expected := "<no value>"; res != expected {
c.Fatalf("Cmd %s, expected %s", res, expected)
if res != "<nil>" {
c.Fatalf("Cmd %s, expected nil", res)
}
}
@@ -3371,7 +3371,7 @@ func (s *DockerSuite) TestBuildInheritance(c *check.C) {
if err != nil {
c.Fatal(err)
}
if expected := "[/bin/echo]"; res != expected {
if expected := "{[/bin/echo]}"; res != expected {
c.Fatalf("Entrypoint %s, expected %s", res, expected)
}
ports2, err := inspectField(name, "Config.ExposedPorts")
@@ -4242,14 +4242,15 @@ func (s *DockerSuite) TestBuildCleanupCmdOnEntrypoint(c *check.C) {
if err != nil {
c.Fatal(err)
}
if expected := "<no value>"; res != expected {
c.Fatalf("Cmd %s, expected %s", res, expected)
if res != "<nil>" {
c.Fatalf("Cmd %s, expected nil", res)
}
res, err = inspectField(name, "Config.Entrypoint")
if err != nil {
c.Fatal(err)
}
if expected := "[cat]"; res != expected {
if expected := "{[cat]}"; res != expected {
c.Fatalf("Entrypoint %s, expected %s", res, expected)
}
}