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

merge conflict fixes

Browse Source
This commit is contained in:
Dani Raznikov
2020-04-15 16:10:45 +03:00
parent e8323441ab 2270ac03d2
commit 8d6a75a745
5 changed files with 66 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/dockerfile/dockerfile.go
-1
View File
@@ -259,7 +259,6 @@ func MakeKanikoStages(opts *config.KanikoOptions, stages []instructions.Stage, m
logrus.Infof("Resolved base name %s to %s", stage.BaseName, stage.Name)
}
baseImageIndex := baseImageIndex(index, stages)
kanikoStages = append(kanikoStages, config.KanikoStage{
Stage: stage,
BaseImageIndex: baseImageIndex,