public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Set escape token in separate function

This commit is contained in:
Priya Wadhwa 2018-03-16 13:35:00 -07:00
parent f33e507018
commit af6a074fd6
No known key found for this signature in database
GPG Key ID: 0D0DAFD8F7AA73AE
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
executor/cmd/root.go
View File

@ -67,6 +67,10 @@ func execute() error {
if err != nil { if err != nil {
return err return err
} }
// Set the escape token
if err := dockerfile.SetEscapeToken(d); err != nil {
return err
}
baseImage := stages[0].BaseName baseImage := stages[0].BaseName
// Unpack file system to root // Unpack file system to root

10
pkg/dockerfile/dockerfile.go
View File

@ -31,10 +31,18 @@ func Parse(b []byte) ([]instructions.Stage, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
EscapeToken = p.EscapeToken
stages, _, err := instructions.Parse(p.AST) stages, _, err := instructions.Parse(p.AST)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return stages, err return stages, err
} }
func SetEscapeToken(b []byte) error {
p, err := parser.Parse(bytes.NewReader(b))
if err != nil {
return err
}
EscapeToken = p.EscapeToken
return nil
}