mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-12-07 19:42:23 +03:00
Code Activity

Cleanup Cmd on ENTRYPOINT instruction

Browse Source 
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
This commit is contained in:
LK4D4
2014-07-08 21:37:20 +04:00
parent 7dba5024e8
commit 1b6546b840
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
integration-cli/docker_cli_build_test.go
View File

@@ -1310,8 +1310,8 @@ func TestBuildEntrypointRunCleanup(t *testing.T) {
if err != nil {
t.Fatal(err)
}
// Cmd inherited from busybox, maybe will be fixed in #5147
if expected := "[/bin/sh]"; res != expected {
// Cmd must be cleaned up
if expected := "<no value>"; res != expected {
t.Fatalf("Cmd %s, expected %s", res, expected)
}
logDone("build - cleanup cmd after RUN")
@@ -1875,3 +1875,36 @@ func TestBuildFromGIT(t *testing.T) {
}
logDone("build - build from GIT")
}
func TestBuildCleanupCmdOnEntrypoint(t *testing.T) {
name := "testbuildcmdcleanuponentrypoint"
defer deleteImages(name)
if _, err := buildImage(name,
`FROM scratch
CMD ["test"]
ENTRYPOINT ["echo"]`,
true); err != nil {
t.Fatal(err)
}
if _, err := buildImage(name,
fmt.Sprintf(`FROM %s
ENTRYPOINT ["cat"]`, name),
true); err != nil {
t.Fatal(err)
}
res, err := inspectField(name, "Config.Cmd")
if err != nil {
t.Fatal(err)
}
if expected := "<no value>"; res != expected {
t.Fatalf("Cmd %s, expected %s", res, expected)
}
res, err = inspectField(name, "Config.Entrypoint")
if err != nil {
t.Fatal(err)
}
if expected := "[cat]"; res != expected {
t.Fatalf("Entrypoint %s, expected %s", res, expected)
}
logDone("build - cleanup cmd on ENTRYPOINT")
}