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

Final cachekey for stage 

Store the last cachekey generated for each stage
If the base image for a stage is present in the map of digest
and cachekeys use the retrieved cachekey instead of the base image
digest in the compositecache
This commit is contained in:
Cole Wippern 2019-11-27 14:40:05 -08:00
parent bfd8562855
commit 2755ae4470
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkg/executor/build.go
View File

@ -54,19 +54,21 @@ const emptyTarSize = 1024
// stageBuilder contains all fields necessary to build one stage of a Dockerfile // stageBuilder contains all fields necessary to build one stage of a Dockerfile
type stageBuilder struct { type stageBuilder struct {
stage config.KanikoStage stage config.KanikoStage
image v1.Image image v1.Image
cf *v1.ConfigFile cf *v1.ConfigFile
snapshotter *snapshot.Snapshotter snapshotter *snapshot.Snapshotter
baseImageDigest string baseImageDigest string
opts *config.KanikoOptions finalCacheKey string
cmds []commands.DockerCommand opts *config.KanikoOptions
args *dockerfile.BuildArgs cmds []commands.DockerCommand
crossStageDeps map[int][]string args *dockerfile.BuildArgs
crossStageDeps map[int][]string
digestToCacheKeyMap map[string]string
} }
// newStageBuilder returns a new type stageBuilder which contains all the information required to build the stage // newStageBuilder returns a new type stageBuilder which contains all the information required to build the stage
func newStageBuilder(opts *config.KanikoOptions, stage config.KanikoStage, crossStageDeps map[int][]string) (*stageBuilder, error) { func newStageBuilder(opts *config.KanikoOptions, stage config.KanikoStage, crossStageDeps map[int][]string, dcm map[string]string) (*stageBuilder, error) {
sourceImage, err := util.RetrieveSourceImage(stage, opts) sourceImage, err := util.RetrieveSourceImage(stage, opts)
if err != nil { if err != nil {
return nil, err return nil, err
@ -93,13 +95,14 @@ func newStageBuilder(opts *config.KanikoOptions, stage config.KanikoStage, cross
return nil, err return nil, err
} }
s := &stageBuilder{ s := &stageBuilder{
stage: stage, stage: stage,
image: sourceImage, image: sourceImage,
cf: imageConfig, cf: imageConfig,
snapshotter: snapshotter, snapshotter: snapshotter,
baseImageDigest: digest.String(), baseImageDigest: digest.String(),
opts: opts, opts: opts,
crossStageDeps: crossStageDeps, crossStageDeps: crossStageDeps,
digestToCacheKeyMap: dcm,
} }
for _, cmd := range s.stage.Commands { for _, cmd := range s.stage.Commands {
@ -163,6 +166,7 @@ func (s *stageBuilder) optimize(compositeKey CompositeCache, cfg v1.Config) erro
if err != nil { if err != nil {
return err return err
} }
s.finalCacheKey = ck
if command.ShouldCacheOutput() { if command.ShouldCacheOutput() {
img, err := layerCache.RetrieveLayer(ck) img, err := layerCache.RetrieveLayer(ck)
if err != nil { if err != nil {
@ -190,7 +194,12 @@ func (s *stageBuilder) optimize(compositeKey CompositeCache, cfg v1.Config) erro
func (s *stageBuilder) build() error { func (s *stageBuilder) build() error {
// Set the initial cache key to be the base image digest, the build args and the SrcContext. // Set the initial cache key to be the base image digest, the build args and the SrcContext.
compositeKey := NewCompositeCache(s.baseImageDigest) var compositeKey *CompositeCache
if cacheKey, ok := s.digestToCacheKeyMap[s.baseImageDigest]; ok {
compositeKey = NewCompositeCache(cacheKey)
} else {
compositeKey = NewCompositeCache(s.baseImageDigest)
}
compositeKey.AddKey(s.opts.BuildArgs...) compositeKey.AddKey(s.opts.BuildArgs...)
// Apply optimizations to the instructions. // Apply optimizations to the instructions.
@ -422,6 +431,7 @@ func CalculateDependencies(opts *config.KanikoOptions) (map[int][]string, error)
// DoBuild executes building the Dockerfile // DoBuild executes building the Dockerfile
func DoBuild(opts *config.KanikoOptions) (v1.Image, error) { func DoBuild(opts *config.KanikoOptions) (v1.Image, error) {
t := timing.Start("Total Build Time") t := timing.Start("Total Build Time")
digestToCacheKeyMap := make(map[string]string)
// Parse dockerfile and unpack base image to root // Parse dockerfile and unpack base image to root
stages, err := dockerfile.Stages(opts) stages, err := dockerfile.Stages(opts)
if err != nil { if err != nil {
@ -442,7 +452,7 @@ func DoBuild(opts *config.KanikoOptions) (v1.Image, error) {
logrus.Infof("Built cross stage deps: %v", crossStageDependencies) logrus.Infof("Built cross stage deps: %v", crossStageDependencies)
for index, stage := range stages { for index, stage := range stages {
sb, err := newStageBuilder(opts, stage, crossStageDependencies) sb, err := newStageBuilder(opts, stage, crossStageDependencies, digestToCacheKeyMap)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -454,6 +464,11 @@ func DoBuild(opts *config.KanikoOptions) (v1.Image, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
d, err := sourceImage.Digest()
if err != nil {
return nil, err
}
digestToCacheKeyMap[d.String()] = sb.finalCacheKey
if stage.Final { if stage.Final {
sourceImage, err = mutate.CreatedAt(sourceImage, v1.Time{Time: time.Now()}) sourceImage, err = mutate.CreatedAt(sourceImage, v1.Time{Time: time.Now()})
if err != nil { if err != nil {