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

Trim the splited builder lines

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-05-01 15:05:52 -07:00
parent 15ea5a479a
commit 4ebec08add
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
builder.go
View file

@ -191,8 +191,8 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
if len(tmp) != 2 { if len(tmp) != 2 {
return nil, fmt.Errorf("Invalid Dockerfile format") return nil, fmt.Errorf("Invalid Dockerfile format")
} }
instruction := tmp[0] instruction := strings.Trim(tmp[0], " ")
arguments := tmp[1] arguments := strings.Trim(tmp[1], " ")
switch strings.ToLower(instruction) { switch strings.ToLower(instruction) {
case "from": case "from":
fmt.Fprintf(stdout, "FROM %s\n", arguments) fmt.Fprintf(stdout, "FROM %s\n", arguments)
@ -247,8 +247,8 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
if len(tmp) != 2 { if len(tmp) != 2 {
return nil, fmt.Errorf("Invalid INSERT format") return nil, fmt.Errorf("Invalid INSERT format")
} }
sourceUrl := tmp[0] sourceUrl := strings.Trim(tmp[0], "")
destPath := tmp[1] destPath := strings.Trim(tmp[1], " ")
fmt.Fprintf(stdout, "COPY %s to %s in %s\n", sourceUrl, destPath, base.ShortId()) fmt.Fprintf(stdout, "COPY %s to %s in %s\n", sourceUrl, destPath, base.ShortId())
file, err := Download(sourceUrl, stdout) file, err := Download(sourceUrl, stdout)