kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

evaluator: ensure entrypoint stays blank if set blank while CMD is set.

Browse source 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
This commit is contained in:
Erik Hollensbe 2014-09-01 13:33:06 -07:00
parent ac107995ae
commit 78a847a47a
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
builder/dispatchers.go
View file

@ -255,11 +255,9 @@ func cmd(b *Builder, args []string, attributes map[string]bool) error {
func entrypoint(b *Builder, args []string, attributes map[string]bool) error {
b.Config.Entrypoint = handleJsonArgs(args, attributes)
if len(b.Config.Entrypoint) == 0 {
if len(b.Config.Entrypoint) == 0 && len(b.Config.Cmd) == 0 {
b.Config.Entrypoint = []string{"/bin/sh", "-c"}
}
if !b.cmdSet {
} else if !b.cmdSet {
b.Config.Cmd = nil
}

19
integration-cli/docker_cli_build_test.go
View file

@ -791,6 +791,25 @@ func TestBuildEntrypoint(t *testing.T) {
if res != expected {
t.Fatalf("Entrypoint %s, expected %s", res, expected)
}
deleteImages(name)
expected = "[]"
_, err = buildImage(name,
`FROM busybox
ENTRYPOINT []`,
true)
if err != nil {
t.Fatal(err)
}
res, err = inspectField(name, "Config.Entrypoint")
if err != nil {
t.Fatal(err)
}
if res != expected {
t.Fatalf("Entrypoint %s, expected %s", res, expected)
}
logDone("build - entrypoint")
}