From f308410920f209de895988c2493e922bd6bf33fe Mon Sep 17 00:00:00 2001 From: user123456 Date: Wed, 18 Jun 2025 15:00:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=BD=E6=95=B0=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E7=82=B9=E4=BC=A0=E9=80=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/imagetar.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/imagetar.go b/src/imagetar.go index ff01e69..0ae69f9 100644 --- a/src/imagetar.go +++ b/src/imagetar.go @@ -278,16 +278,16 @@ func (is *ImageStreamer) streamImageLayers(ctx context.Context, img v1.Image, wr log.Printf("镜像包含 %d 层", len(layers)) - return is.streamDockerFormat(ctx, tarWriter, img, layers, configFile, imageRef) + return is.streamDockerFormat(ctx, tarWriter, img, layers, configFile, imageRef, options) } // streamDockerFormat 生成Docker格式 -func (is *ImageStreamer) streamDockerFormat(ctx context.Context, tarWriter *tar.Writer, img v1.Image, layers []v1.Layer, configFile *v1.ConfigFile, imageRef string) error { - return is.streamDockerFormatWithReturn(ctx, tarWriter, img, layers, configFile, imageRef, nil, nil) +func (is *ImageStreamer) streamDockerFormat(ctx context.Context, tarWriter *tar.Writer, img v1.Image, layers []v1.Layer, configFile *v1.ConfigFile, imageRef string, options *StreamOptions) error { + return is.streamDockerFormatWithReturn(ctx, tarWriter, img, layers, configFile, imageRef, nil, nil, options) } // streamDockerFormatWithReturn 生成Docker格式并返回manifest和repositories信息 -func (is *ImageStreamer) streamDockerFormatWithReturn(ctx context.Context, tarWriter *tar.Writer, img v1.Image, layers []v1.Layer, configFile *v1.ConfigFile, imageRef string, manifestOut *map[string]interface{}, repositoriesOut *map[string]map[string]string) error { +func (is *ImageStreamer) streamDockerFormatWithReturn(ctx context.Context, tarWriter *tar.Writer, img v1.Image, layers []v1.Layer, configFile *v1.ConfigFile, imageRef string, manifestOut *map[string]interface{}, repositoriesOut *map[string]map[string]string, options *StreamOptions) error { configDigest, err := img.ConfigName() if err != nil { return err @@ -491,7 +491,7 @@ func (is *ImageStreamer) streamSingleImageForBatch(ctx context.Context, tarWrite log.Printf("镜像包含 %d 层", len(layers)) - err = is.streamDockerFormatWithReturn(ctx, tarWriter, img, layers, configFile, imageRef, &manifest, &repositories) + err = is.streamDockerFormatWithReturn(ctx, tarWriter, img, layers, configFile, imageRef, &manifest, &repositories, options) if err != nil { return nil, nil, err } @@ -513,7 +513,7 @@ func (is *ImageStreamer) streamSingleImageForBatch(ctx context.Context, tarWrite log.Printf("镜像包含 %d 层", len(layers)) - err = is.streamDockerFormatWithReturn(ctx, tarWriter, img, layers, configFile, imageRef, &manifest, &repositories) + err = is.streamDockerFormatWithReturn(ctx, tarWriter, img, layers, configFile, imageRef, &manifest, &repositories, options) if err != nil { return nil, nil, err } @@ -535,7 +535,7 @@ func (is *ImageStreamer) streamSingleImageForBatch(ctx context.Context, tarWrite log.Printf("镜像包含 %d 层", len(layers)) - err = is.streamDockerFormatWithReturn(ctx, tarWriter, img, layers, configFile, imageRef, &manifest, &repositories) + err = is.streamDockerFormatWithReturn(ctx, tarWriter, img, layers, configFile, imageRef, &manifest, &repositories, options) if err != nil { return nil, nil, err }