From 92e98c66af7543f9a9d6c1a223333201b39aa6dc Mon Sep 17 00:00:00 2001 From: "Guillaume J. Charmes" Date: Wed, 1 May 2013 16:26:26 -0700 Subject: [PATCH] Implement MAINTAINER to builder --- builder.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/builder.go b/builder.go index 8d94c40f95..6ab3a6f84e 100644 --- a/builder.go +++ b/builder.go @@ -168,6 +168,7 @@ func (builder *Builder) clearTmp(containers, images map[string]struct{}) { func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, error) { var ( image, base *Image + maintainer string tmpContainers map[string]struct{} = make(map[string]struct{}) tmpImages map[string]struct{} = make(map[string]struct{}) ) @@ -219,6 +220,10 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e } } + break + case "mainainer": + fmt.Fprintf(stdout, "MAINTAINER %s\n", arguments) + maintainer = arguments break case "run": fmt.Fprintf(stdout, "RUN %s\n", arguments) @@ -246,7 +251,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e } // Commit the container - base, err = builder.Commit(c, "", "", "", "", nil) + base, err = builder.Commit(c, "", "", "", maintainer, nil) if err != nil { return nil, err } @@ -266,7 +271,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e if len(tmp) != 2 { return nil, fmt.Errorf("Invalid INSERT format") } - sourceUrl := strings.Trim(tmp[0], "") + sourceUrl := strings.Trim(tmp[0], " ") destPath := strings.Trim(tmp[1], " ") fmt.Fprintf(stdout, "COPY %s to %s in %s\n", sourceUrl, destPath, base.ShortId()) @@ -298,7 +303,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e return nil, err } - base, err = builder.Commit(c, "", "", "", "", nil) + base, err = builder.Commit(c, "", "", "", maintainer, nil) if err != nil { return nil, err }