toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change dockerbulder format, no more tabs and COPY becomes INSERT to avoid conflict with contrib script

Browse Source 
Upstream-commit: 6bfb652f5b1bce989868f8269c3d736f3faf259a
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-05-01 13:45:35 -07:00
parent cb5a080cbe
commit 12e1796fbe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/engine/builder.go
View File

@ -142,7 +142,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
if len(line) == 0 || line[0] == '#' {
continue
}
tmp := strings.SplitN(line, " ", 2)
tmp := strings.SplitN(line, " ", 2)
if len(tmp) != 2 {
return nil, fmt.Errorf("Invalid Dockerfile format")
}
@ -192,13 +192,13 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
image = base
break
case "copy":
case "insert":
if image == nil {
return nil, fmt.Errorf("Please provide a source image with `from` prior to copy")
}
tmp2 := strings.SplitN(tmp[1], " ", 2)
if len(tmp) != 2 {
return nil, fmt.Errorf("Invalid COPY format")
return nil, fmt.Errorf("Invalid INSERT format")
}
fmt.Fprintf(stdout, "COPY %s to %s in %s\n", tmp2[0], tmp2[1], base.ShortId())
@ -240,7 +240,7 @@ func (builder *Builder) Build(dockerfile io.Reader, stdout io.Writer) (*Image, e
break
default:
fmt.Fprintf(stdout, "Skipping unknown op %s\n", tmp[0])
fmt.Fprintf(stdout, "Skipping unknown instruction %s\n", instruction)
}
}
if base != nil {