mirror of
https://github.com/clearlinux/docker.git
synced 2026-09-07 22:42:09 +00:00
builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
This commit is contained in:
committed by
Tibor Vass
parent
3d287811d7
commit
7f8cdeb18b
@@ -87,10 +87,11 @@ func parseLine(line string) (string, *Node, error) {
|
||||
|
||||
if sexp.Value != "" || sexp.Next != nil || sexp.Children != nil {
|
||||
node.Next = sexp
|
||||
node.Attributes = attrs
|
||||
node.Original = line
|
||||
}
|
||||
|
||||
node.Attributes = attrs
|
||||
node.Original = line
|
||||
|
||||
return "", node, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user