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

fix previous name checking in 'executor.build.fetchExtraStages'

This commit is contained in:
Ben Einaudi 2020-03-30 00:02:48 +02:00
parent 1534f90c93
commit d763b7e961
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/executor/build.go
View File

@ -705,7 +705,7 @@ func fetchExtraStages(stages []config.KanikoStage, opts *config.KanikoOptions) e
t := timing.Start("Fetching Extra Stages") t := timing.Start("Fetching Extra Stages")
defer timing.DefaultRun.Stop(t) defer timing.DefaultRun.Stop(t)
var names = []string{} var names []string
for stageIndex, s := range stages { for stageIndex, s := range stages {
for _, cmd := range s.Commands { for _, cmd := range s.Commands {
@ -722,11 +722,10 @@ func fetchExtraStages(stages []config.KanikoStage, opts *config.KanikoOptions) e
continue continue
} }
// Check if the name is the alias of a previous stage // Check if the name is the alias of a previous stage
for _, name := range names { if fromPreviousStage(c, names) {
if name == c.From { continue
continue
}
} }
// This must be an image name, fetch it. // This must be an image name, fetch it.
logrus.Debugf("Found extra base image stage %s", c.From) logrus.Debugf("Found extra base image stage %s", c.From)
sourceImage, err := util.RetrieveRemoteImage(c.From, opts) sourceImage, err := util.RetrieveRemoteImage(c.From, opts)
@ -747,6 +746,16 @@ func fetchExtraStages(stages []config.KanikoStage, opts *config.KanikoOptions) e
} }
return nil return nil
} }
func fromPreviousStage(copyCommand *instructions.CopyCommand, previousStageNames []string) bool {
for _, previousStageName := range previousStageNames {
if previousStageName == copyCommand.From {
return true
}
}
return false
}
func extractImageToDependencyDir(name string, image v1.Image) error { func extractImageToDependencyDir(name string, image v1.Image) error {
t := timing.Start("Extracting Image to Dependency Dir") t := timing.Start("Extracting Image to Dependency Dir")
defer timing.DefaultRun.Stop(t) defer timing.DefaultRun.Stop(t)