From aefbd49038800a5b9cc8bce0b001c9f3d423dbe3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 25 Aug 2023 00:07:29 +0200 Subject: [PATCH] daemon/containerd: newROLayerForImage: remove unused args Also rename variables that collided with imports. Signed-off-by: Sebastiaan van Stijn --- daemon/containerd/image_builder.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/containerd/image_builder.go b/daemon/containerd/image_builder.go index c1a37d3662..1f371e4630 100644 --- a/daemon/containerd/image_builder.go +++ b/daemon/containerd/image_builder.go @@ -76,12 +76,12 @@ func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID s return nil, nil, system.ErrNotSupportedOperatingSystem } - layer, err := newROLayerForImage(ctx, &imgDesc, i, opts, refOrID, opts.Platform) + roLayer, err := newROLayerForImage(ctx, &imgDesc, i, opts.Platform) if err != nil { return nil, nil, err } - return img, layer, nil + return img, roLayer, nil } } @@ -105,12 +105,12 @@ func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID s return nil, nil, err } - layer, err := newROLayerForImage(ctx, imgDesc, i, opts, refOrID, opts.Platform) + roLayer, err := newROLayerForImage(ctx, imgDesc, i, opts.Platform) if err != nil { return nil, nil, err } - return img, layer, nil + return img, roLayer, nil } func (i *ImageService) pullForBuilder(ctx context.Context, name string, authConfigs map[string]registry.AuthConfig, output io.Writer, platform *ocispec.Platform) (*ocispec.Descriptor, error) { @@ -173,7 +173,7 @@ Please notify the image author to correct the configuration.`, return &imgDesc, err } -func newROLayerForImage(ctx context.Context, imgDesc *ocispec.Descriptor, i *ImageService, opts backend.GetImageAndLayerOptions, refOrID string, platform *ocispec.Platform) (builder.ROLayer, error) { +func newROLayerForImage(ctx context.Context, imgDesc *ocispec.Descriptor, i *ImageService, platform *ocispec.Platform) (builder.ROLayer, error) { if imgDesc == nil { return nil, fmt.Errorf("can't make an RO layer for a nil image :'(") }