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

move ToAbsPath to a function

This commit is contained in:
Martin Zihlmann 2024-10-13 08:09:45 +01:00
parent e39ab33677
commit caebb2a538
No known key found for this signature in database
GPG Key ID: 0F7784F41354DE99
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/commands/workdir.go
View File

@ -38,6 +38,18 @@ type WorkdirCommand struct {
shdCache bool shdCache bool
} }
func ToAbsPath(path string, workdir string) string {
if filepath.IsAbs(path) {
return path
} else {
if workdir != "" {
return filepath.Join(workdir, path)
} else {
return filepath.Join("/", path)
}
}
}
// For testing // For testing
var mkdirAllWithPermissions = util.MkdirAllWithPermissions var mkdirAllWithPermissions = util.MkdirAllWithPermissions
@ -49,15 +61,7 @@ func (w *WorkdirCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfile
if err != nil { if err != nil {
return err return err
} }
if filepath.IsAbs(resolvedWorkingDir) { config.WorkingDir = ToAbsPath(resolvedWorkingDir, config.WorkingDir)
config.WorkingDir = resolvedWorkingDir
} else {
if config.WorkingDir != "" {
config.WorkingDir = filepath.Join(config.WorkingDir, resolvedWorkingDir)
} else {
config.WorkingDir = filepath.Join("/", resolvedWorkingDir)
}
}
logrus.Infof("Changed working directory to %s", config.WorkingDir) logrus.Infof("Changed working directory to %s", config.WorkingDir)
// Only create and snapshot the dir if it didn't exist already // Only create and snapshot the dir if it didn't exist already
@ -136,15 +140,7 @@ func (wr *CachingWorkdirCommand) ExecuteCommand(config *v1.Config, buildArgs *do
if err != nil { if err != nil {
return err return err
} }
if filepath.IsAbs(resolvedWorkingDir) { config.WorkingDir = ToAbsPath(resolvedWorkingDir, config.WorkingDir)
config.WorkingDir = resolvedWorkingDir
} else {
if config.WorkingDir != "" {
config.WorkingDir = filepath.Join(config.WorkingDir, resolvedWorkingDir)
} else {
config.WorkingDir = filepath.Join("/", resolvedWorkingDir)
}
}
logrus.Infof("Changed working directory to %s", config.WorkingDir) logrus.Infof("Changed working directory to %s", config.WorkingDir)
logrus.Infof("Found cached layer, extracting to filesystem") logrus.Infof("Found cached layer, extracting to filesystem")