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

builder/parser: fix handling of empty strings as the only argument.

Browse source 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
This commit is contained in:
Erik Hollensbe 2014-08-29 13:04:34 -07:00
parent 234f0e4f79
commit 6b322ad2d3
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
builder/parser/parser.go
View file

@ -81,8 +81,10 @@ func parseLine(line string) (string, *Node, error) {
return "", nil, err
}
node.Next = sexp
node.Attributes = attrs
if sexp.Value != "" || sexp.Next != nil || sexp.Children != nil {
node.Next = sexp
node.Attributes = attrs
}
return "", node, nil
}

5
builder/parser/parser_test.go
View file

@ -1,6 +1,7 @@
package parser
import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
@ -69,7 +70,9 @@ func TestTestData(t *testing.T) {
t.Fatalf("Error reading %s's result file: %s", dir.Name(), err.Error())
}
if ast.Dump() != string(content) {
if ast.Dump()+"\n" != string(content) {
fmt.Fprintln(os.Stderr, ast.Dump())
fmt.Fprintln(os.Stderr, string(content))
t.Fatalf("%s: AST dump of dockerfile does not match result", dir.Name())
}

2
builder/parser/testfiles/brimstone-docker-consul/result
View file

@ -1,5 +1,5 @@
(from "brimstone/ubuntu:14.04")
(cmd "")
(cmd)
(entrypoint "/usr/bin/consul" "agent" "-server" "-data-dir=/consul" "-client=0.0.0.0" "-ui-dir=/webui")
(expose "8500" "8600" "8400" "8301" "8302")
(run "apt-get update && apt-get install -y unzip wget && apt-get clean && rm -rf /var/lib/apt/lists")