0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show err msg on empty 'scratch' Dockerfile

Browse source 
If you have a Dockefile with just:
   FROM scratch

An error is generated but its never shown to the CLI. This PR fixes that.

Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
Doug Davis 2015-02-10 11:10:10 -08:00
parent d14751bf30
commit 1654dfdf14
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builder/evaluator.go
View file

@ -163,7 +163,7 @@ func (b *Builder) Run(context io.Reader) (string, error) {
}
if b.image == "" {
return "", fmt.Errorf("No image was generated. Is your Dockerfile empty?\n")
return "", fmt.Errorf("No image was generated. Is your Dockerfile empty?")
}
fmt.Fprintf(b.OutStream, "Successfully built %s\n", utils.TruncateID(b.image))

12
integration-cli/docker_cli_build_test.go
View file

@ -4870,3 +4870,15 @@ func TestBuildMissingArgs(t *testing.T) {
logDone("build - verify missing args")
}
func TestBuildEmptyScratch(t *testing.T) {
defer deleteImages("sc")
_, out, err := buildImageWithOut("sc", "FROM scratch", true)
if err == nil {
t.Fatalf("Build was supposed to fail")
}
if !strings.Contains(out, "No image was generated") {
t.Fatalf("Wrong error message: %v", out)
}
logDone("build - empty scratch Dockerfile")
}