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

builder/dockerfile: improve error message about build stage name

Browse source 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2017-04-05 06:08:07 +00:00
parent 2daa2b894c
commit 50a9be4bf5
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builder/dockerfile/dispatchers.go
View file

@ -211,7 +211,7 @@ func from(b *Builder, args []string, attributes map[string]bool, original string
return errors.Errorf("invalid name for build stage: %q, name can't start with a number or contain symbols", ctxName) return errors.Errorf("invalid name for build stage: %q, name can't start with a number or contain symbols", ctxName)
} }
} else if len(args) != 1 { } else if len(args) != 1 {
return errExactlyOneArgument("FROM") return errors.New("FROM requires either one or three arguments")
} }
if err := b.flags.Parse(); err != nil { if err := b.flags.Parse(); err != nil {

1
builder/dockerfile/dispatchers_test.go
View file

@ -20,7 +20,6 @@ type commandWithFunction struct {
func TestCommandsExactlyOneArgument(t *testing.T) { func TestCommandsExactlyOneArgument(t *testing.T) {
commands := []commandWithFunction{ commands := []commandWithFunction{
{"MAINTAINER", func(args []string) error { return maintainer(nil, args, nil, "") }}, {"MAINTAINER", func(args []string) error { return maintainer(nil, args, nil, "") }},
{"FROM", func(args []string) error { return from(nil, args, nil, "") }},
{"WORKDIR", func(args []string) error { return workdir(nil, args, nil, "") }}, {"WORKDIR", func(args []string) error { return workdir(nil, args, nil, "") }},
{"USER", func(args []string) error { return user(nil, args, nil, "") }}, {"USER", func(args []string) error { return user(nil, args, nil, "") }},
{"STOPSIGNAL", func(args []string) error { return stopSignal(nil, args, nil, "") }}} {"STOPSIGNAL", func(args []string) error { return stopSignal(nil, args, nil, "") }}}