Merge pull request containerd#3626 from apostasie/fix-convert-fail-pull

AkihiroSuda · web-flow · commit e33707b33682 · 2024-11-01T17:12:25.000+09:00
Regression: fix convert unable to find image
diff --git a/pkg/cmd/image/convert.go b/pkg/cmd/image/convert.go
@@ -76,7 +76,7 @@ func Convert(ctx context.Context, client *containerd.Client, srcRawRef, targetRa
 	convertOpts = append(convertOpts, converter.WithPlatform(platMC))
 
 	// Ensure all the layers are here: https://github.com/containerd/nerdctl/issues/3425
-	err = EnsureAllContent(ctx, client, srcRawRef, options.GOptions)
+	err = EnsureAllContent(ctx, client, srcRef, options.GOptions)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func Convert(ctx context.Context, client *containerd.Client, srcRawRef, targetRa`
`76`	`76`	`convertOpts = append(convertOpts, converter.WithPlatform(platMC))`
`77`	`77`
`78`	`78`	`// Ensure all the layers are here: https://github.com/containerd/nerdctl/issues/3425`
`79`		`- err = EnsureAllContent(ctx, client, srcRawRef, options.GOptions)`
	`79`	`+ err = EnsureAllContent(ctx, client, srcRef, options.GOptions)`
`80`	`80`	`if err != nil {`
`81`	`81`	`return err`
`82`	`82`	`}`