Skip to content
This repository was archived by the owner on May 4, 2021. It is now read-only.

Use layers digest for CacheID in FROM step #307

Open
krumstein wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Use layers digest for CacheID in FROM step #307

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c078c7
Use image digest for cacheid in FROM step
krumstein Feb 21, 2020
a32ca85
Use sha of layers
krumstein Feb 22, 2020
39c3b18
Use s.image for cache generation as well.
krumstein Feb 24, 2020
1d17431
Remove a test log message
krumstein Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions lib/builder/step/from_step.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,20 @@ func (s *FromStep) GetAlias() string {
return s.alias
}

// SetCacheID sets the cacheID of the step using the name of the base image.
// TODO: Use the sha of that image instead of the image name itself.
// SetCacheID sets the cacheID of the step using the sha of that image.
func (s *FromStep) SetCacheID(ctx *context.BuildContext, seed string) error {
checksum := crc32.ChecksumIEEE([]byte(seed + string(s.directive) + s.image))
manifest, err := s.getManifest(ctx.ImageStore)
if err != nil {
log.Infof("Could not get manifest: %s. Using hash of from %s as cacheID.", err, string(s.directive)+s.image)
checksum := crc32.ChecksumIEEE([]byte(seed + string(s.directive) + s.image))
s.cacheID = fmt.Sprintf("%x", checksum)
return nil
}
layerDigest := ""
for _, layer := range manifest.Layers {
layerDigest += string(layer.Digest)
}
checksum := crc32.ChecksumIEEE([]byte(seed + layerDigest))
s.cacheID = fmt.Sprintf("%x", checksum)
return nil
}
Expand Down