dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-05 23:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50824 from thaJeztah/fix_shadow

Browse Source 
ImageCache.restoreCachedImage: rename var that shadowed import
This commit is contained in:
Austin Vazquez
2025-08-27 10:54:48 -07:00
committed by GitHub
parent 8ac1bfa6c5 b0b7260c77
commit 38be9f1257
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/internal/image/cache/cache.go vendored
View File

@@ -134,9 +134,9 @@ func (ic *ImageCache) restoreCachedImage(parent, target *image.Image, cfg *conta
lenHistory = len(parent.History)
}
history = append(history, target.History[lenHistory])
layer := getLayerForHistoryIndex(target, lenHistory)
if layer != "" {
rootFS.Append(layer)
layerDiffID := getLayerForHistoryIndex(target, lenHistory)
if layerDiffID != "" {
rootFS.Append(layerDiffID)
}
restoredImg := image.Image{
@@ -154,7 +154,7 @@ func (ic *ImageCache) restoreCachedImage(parent, target *image.Image, cfg *conta
OSVersion: target.OSVersion,
}
imgID, err := ic.store.Create(parent, restoredImg, layer)
imgID, err := ic.store.Create(parent, restoredImg, layerDiffID)
if err != nil {
return "", errors.Wrap(err, "failed to create cache image")
}