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

Update workdir to use default escape token

This commit is contained in:
Priya Wadhwa 2018-03-27 15:15:55 -07:00
parent 416c58e956
commit ad17811c39
No known key found for this signature in database
GPG Key ID: 0D0DAFD8F7AA73AE
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/commands/workdir.go
View File

@ -23,7 +23,6 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"os" "os"
"path/filepath" "path/filepath"
"strings"
) )
type WorkdirCommand struct { type WorkdirCommand struct {
@ -34,7 +33,7 @@ type WorkdirCommand struct {
func (w *WorkdirCommand) ExecuteCommand(config *manifest.Schema2Config) error { func (w *WorkdirCommand) ExecuteCommand(config *manifest.Schema2Config) error {
logrus.Info("cmd: workdir") logrus.Info("cmd: workdir")
workdirPath := w.cmd.Path workdirPath := w.cmd.Path
resolvedWorkingDir, err := util.ResolveEnvironmentReplacement(w.workdirToString(), workdirPath, config.Env, true) resolvedWorkingDir, err := util.ResolveEnvironmentReplacement(workdirPath, config.Env, true)
if err != nil { if err != nil {
return err return err
} }
@ -48,11 +47,6 @@ func (w *WorkdirCommand) ExecuteCommand(config *manifest.Schema2Config) error {
return os.MkdirAll(config.WorkingDir, 0755) return os.MkdirAll(config.WorkingDir, 0755)
} }
func (w *WorkdirCommand) workdirToString() string {
workdir := []string{"WORKDIR"}
return strings.Join(append(workdir, w.cmd.Path), " ")
}
// FilesToSnapshot returns the workingdir, which should have been created if it didn't already exist // FilesToSnapshot returns the workingdir, which should have been created if it didn't already exist
func (w *WorkdirCommand) FilesToSnapshot() []string { func (w *WorkdirCommand) FilesToSnapshot() []string {
return w.snapshotFiles return w.snapshotFiles