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

Merge pull request #180 from priyawadhwa/arg 

Pass in clone of buildargs for dockerfile parsing
This commit is contained in:
priyawadhwa 2018-05-15 10:25:13 -07:00 committed by GitHub
parent d2fc49f505 6934f785c8
commit dec203eaff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/dockerfile/buildargs.go
View File

@ -40,6 +40,13 @@ func NewBuildArgs(args []string) *BuildArgs {
}
}
func (b *BuildArgs) Clone() *BuildArgs {
clone := b.BuildArgs.Clone()
return &BuildArgs{
*clone,
}
}
// ReplacementEnvs returns a list of filtered environment variables
func (b *BuildArgs) ReplacementEnvs(envs []string) []string {
filtered := b.FilterAllowed(envs)

2
pkg/executor/executor.go
View File

@ -157,7 +157,7 @@ func DoBuild(dockerfilePath, srcContext, snapshotMode string, args []string) (na
}
return ref, sourceImage, nil
}
if err := saveStageDependencies(index, stages, buildArgs); err != nil {
if err := saveStageDependencies(index, stages, buildArgs.Clone()); err != nil {
return nil, nil, err
}
// Delete the filesystem

3
pkg/util/fs_util.go
View File

@ -305,9 +305,6 @@ func RelativeFiles(fp string, root string) ([]string, error) {
if err != nil {
return err
}
if PathInWhitelist(path, root) {
return nil
}
relPath, err := filepath.Rel(root, path)
if err != nil {
return err