docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix panic when `ENV ARG=ARG` is used. 

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
This commit is contained in:
Erik Hollensbe 2014-08-31 05:39:36 -07:00
parent 280b64bc7b
commit a0255ba502
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builder/parser/line_parsers.go
View File

@ -9,6 +9,7 @@ package parser
import ( import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"strconv" "strconv"
"strings" "strings"
) )
@ -43,6 +44,11 @@ func parseEnv(rest string) (*Node, map[string]bool, error) {
node := &Node{} node := &Node{}
rootnode := node rootnode := node
strs := TOKEN_WHITESPACE.Split(rest, 2) strs := TOKEN_WHITESPACE.Split(rest, 2)
if len(strs) < 2 {
return nil, nil, fmt.Errorf("ENV must have two arguments")
}
node.Value = strs[0] node.Value = strs[0]
node.Next = &Node{} node.Next = &Node{}
node.Next.Value = strs[1] node.Next.Value = strs[1]

3
builder/parser/testfiles-negative/env_equals_env/Dockerfile Normal file
View File

@ -0,0 +1,3 @@
FROM busybox
ENV PATH=PATH