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

refactor

This commit is contained in:
Tejal Desai 2020-01-22 16:31:45 -08:00
parent bb129e9c88
commit 79d226ade0
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/executor/build.go
View File

@ -587,11 +587,8 @@ func DoBuild(opts *config.KanikoOptions) (v1.Image, error) {
// fileToSave returns all the files matching the given pattern in deps. // fileToSave returns all the files matching the given pattern in deps.
// If a file is a symlink, it also returns the target file. // If a file is a symlink, it also returns the target file.
// It first returns all the target files and then symlinks so they can copied
// in that order to the kaniko workspace.
func filesToSave(deps []string) ([]string, error) { func filesToSave(deps []string) ([]string, error) {
srcFiles := []string{} srcFiles := []string{}
symLinks := []string{}
for _, src := range deps { for _, src := range deps {
srcs, err := filepath.Glob(src) srcs, err := filepath.Glob(src)
if err != nil { if err != nil {
@ -599,14 +596,12 @@ func filesToSave(deps []string) ([]string, error) {
} }
for _, f := range srcs { for _, f := range srcs {
if link, err := util.EvalSymLink(f); err == nil { if link, err := util.EvalSymLink(f); err == nil {
symLinks = append(symLinks, f)
srcFiles = append(srcFiles, link) srcFiles = append(srcFiles, link)
} else {
srcFiles = append(srcFiles, f)
} }
srcFiles = append(srcFiles, f)
} }
} }
return append(srcFiles, symLinks...), nil return srcFiles, nil
} }
func fetchExtraStages(stages []config.KanikoStage, opts *config.KanikoOptions) error { func fetchExtraStages(stages []config.KanikoStage, opts *config.KanikoOptions) error {