kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

builder: clearly display ONBUILD triggers during a build. 

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
This commit is contained in:
Solomon Hykes 2014-02-04 18:41:37 +00:00
parent 9f994c9646
commit ded9e0d6df
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buildfile.go
View File

@ -112,8 +112,8 @@ func (b *buildFile) CmdFrom(name string) error {
if nTriggers := len(b.config.OnBuild); nTriggers != 0 { if nTriggers := len(b.config.OnBuild); nTriggers != 0 {
fmt.Fprintf(b.errStream, "# Executing %d build triggers\n", nTriggers) fmt.Fprintf(b.errStream, "# Executing %d build triggers\n", nTriggers)
} }
for _, step := range b.config.OnBuild { for n, step := range b.config.OnBuild {
if err := b.BuildStep(step); err != nil { if err := b.BuildStep(fmt.Sprintf("onbuild-%d", n), step); err != nil {
return err return err
} }
} }
@ -697,8 +697,7 @@ func (b *buildFile) Build(context io.Reader) (string, error) {
if len(line) == 0 || line[0] == '#' { if len(line) == 0 || line[0] == '#' {
continue continue
} }
fmt.Fprintf(b.outStream, "Step %d : %s\n", stepN, line) if err := b.BuildStep(fmt.Sprintf("%d", stepN), line); err != nil {
if err := b.BuildStep(line); err != nil {
return "", err return "", err
} }
stepN += 1 stepN += 1
@ -715,7 +714,8 @@ func (b *buildFile) Build(context io.Reader) (string, error) {
} }
// BuildStep parses a single build step from `instruction` and executes it in the current context. // BuildStep parses a single build step from `instruction` and executes it in the current context.
func (b *buildFile) BuildStep(expression string) error { func (b *buildFile) BuildStep(name, expression string) error {
fmt.Fprintf(b.outStream, "Step %s : %s\n", name, expression)
tmp := strings.SplitN(expression, " ", 2) tmp := strings.SplitN(expression, " ", 2)
if len(tmp) != 2 { if len(tmp) != 2 {
return fmt.Errorf("Invalid Dockerfile format") return fmt.Errorf("Invalid Dockerfile format")

4
integration/buildfile_test.go
View File

@ -855,8 +855,8 @@ func TestBuildOnBuildTrigger(t *testing.T) {
onbuild run touch foobar onbuild run touch foobar
`, `,
nil, nil, nil, nil,
}, },
t, nil, true, t, nil, true,
) )
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)