From 5581efe7cd846a8eaaa7f59495466b4516f4cd19 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 19 Jan 2024 12:50:13 +0100 Subject: [PATCH] rename "ociimage" var to be proper camelCase Signed-off-by: Sebastiaan van Stijn --- daemon/containerd/image.go | 4 ++-- daemon/containerd/image_history.go | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon/containerd/image.go b/daemon/containerd/image.go index ff7d8609fd..db68bfb0d1 100644 --- a/daemon/containerd/image.go +++ b/daemon/containerd/image.go @@ -81,9 +81,9 @@ func (i *ImageService) GetImage(ctx context.Context, refOrID string, options ima sort.SliceStable(presentImages, func(i, j int) bool { return platform.Less(presentImages[i].Platform, presentImages[j].Platform) }) - ociimage := presentImages[0] + ociImage := presentImages[0] - img := dockerOciImageToDockerImagePartial(image.ID(desc.Target.Digest), ociimage) + img := dockerOciImageToDockerImagePartial(image.ID(desc.Target.Digest), ociImage) parent, err := i.getImageLabelByDigest(ctx, desc.Target.Digest, imageLabelClassicBuilderParent) if err != nil { diff --git a/daemon/containerd/image_history.go b/daemon/containerd/image_history.go index b6fdfe053a..2fd01169d4 100644 --- a/daemon/containerd/image_history.go +++ b/daemon/containerd/image_history.go @@ -36,11 +36,11 @@ func (i *ImageService) ImageHistory(ctx context.Context, name string) ([]*imaget if err != nil { return err } - var ociimage ocispec.Image - if err := readConfig(ctx, cs, conf, &ociimage); err != nil { + var ociImage ocispec.Image + if err := readConfig(ctx, cs, conf, &ociImage); err != nil { return err } - presentImages = append(presentImages, ociimage) + presentImages = append(presentImages, ociImage) return nil }) if err != nil { @@ -53,7 +53,7 @@ func (i *ImageService) ImageHistory(ctx context.Context, name string) ([]*imaget sort.SliceStable(presentImages, func(i, j int) bool { return platform.Less(presentImages[i].Platform, presentImages[j].Platform) }) - ociimage := presentImages[0] + ociImage := presentImages[0] var ( history []*imagetype.HistoryResponseItem @@ -61,7 +61,7 @@ func (i *ImageService) ImageHistory(ctx context.Context, name string) ([]*imaget ) s := i.client.SnapshotService(i.snapshotter) - diffIDs := ociimage.RootFS.DiffIDs + diffIDs := ociImage.RootFS.DiffIDs for i := range diffIDs { chainID := identity.ChainID(diffIDs[0 : i+1]).String() @@ -73,7 +73,7 @@ func (i *ImageService) ImageHistory(ctx context.Context, name string) ([]*imaget sizes = append(sizes, use.Size) } - for _, h := range ociimage.History { + for _, h := range ociImage.History { size := int64(0) if !h.EmptyLayer { if len(sizes) == 0 {