From b0b7260c774016694e2dfcdbccf70416b0a75c7f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 27 Aug 2025 14:35:16 +0200 Subject: [PATCH] ImageCache.restoreCachedImage: rename var that shadowed import Signed-off-by: Sebastiaan van Stijn --- daemon/internal/image/cache/cache.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/internal/image/cache/cache.go b/daemon/internal/image/cache/cache.go index 30b39c22a6..9456884d3f 100644 --- a/daemon/internal/image/cache/cache.go +++ b/daemon/internal/image/cache/cache.go @@ -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") }