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

line continuation regex

Browse Source 
Upstream-commit: ebb934c1b044f4bbffe312e9c88c00134c94ef7f
Component: engine
This commit is contained in:
Jason McVetta
2013-09-09 17:02:45 -07:00
parent f94f2fe1fc
commit 58dbcaf56e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/buildfile.go
View File

@ -458,7 +458,8 @@ func (b *buildFile) commit(id string, autoCmd []string, comment string) error {
return nil
}
var multilineRegex = regexp.MustCompile("\\.*\n")
// Long lines can be split with a backslash
var lineContinuation = regexp.MustCompile(`\s*\\.*\n`)
func (b *buildFile) Build(context io.Reader) (string, error) {
// FIXME: @creack any reason for using /tmp instead of ""?
@ -481,7 +482,7 @@ func (b *buildFile) Build(context io.Reader) (string, error) {
return "", err
}
dockerfile := string(fileBytes)
// dockerfile = multilineRegex.ReplaceAllString(dockerfile, " ")
dockerfile = lineContinuation.ReplaceAllString(dockerfile, " ")
stepN := 0
for _, line := range strings.Split(dockerfile, "\n") {
/* line, err := dockerfile.ReadString('\n')