public_git/kaniko
1
0
Fork 0
mirror of https://github.com/GoogleContainerTools/kaniko synced 2026-10-22 08:53:35 +02:00
Code Issues Releases Wiki Activity

revert back to previous file to save logic

Browse Source
This commit is contained in:
Tejal Desai
2020-03-25 09:43:59 -07:00
parent caaf6c8adf
commit 2ea28fc7f5
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/executor/build.go
+18 -8
View File
@@ -655,15 +655,25 @@ func DoBuild(opts *config.KanikoOptions) (v1.Image, error) {
// If a file is a symlink, it also returns the target file.
func filesToSave(deps []string) ([]string, error) {
srcFiles := []string{}
srcs, err := util.ResolveSources(deps, config.RootDir)
if err != nil {
return nil, errors.Wrap(err, "resolving sources to save")
}
for _, f := range srcs {
if link, err := util.EvalSymLink(f); err == nil {
srcFiles = append(srcFiles, link)
for _, src := range deps {
srcs, err := filepath.Glob(filepath.Join(config.RootDir, src))
if err != nil {
return nil, err
}
for _, f := range srcs {
if link, err := util.EvalSymLink(f); err == nil {
link, err = filepath.Rel(config.RootDir, link)
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("could not find relative path to %s", config.RootDir))
}
srcFiles = append(srcFiles, link)
}
f, err = filepath.Rel(config.RootDir, f)
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("could not find relative path to %s", config.RootDir))
}
srcFiles = append(srcFiles, f)
}
srcFiles = append(srcFiles, f)
}
return srcFiles, nil
}