Merge pull request #226 from WaberZhuang/main

Exclude baselayer when using mkfs (turboOCI)
containerd · Sep 20, 2023 · 9ac0044 · 9ac0044
2 parents 85d30e2 + 5469bb2
commit 9ac0044
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/cmd/convertor/builder/turboOCI_builder.go b/cmd/convertor/builder/turboOCI_builder.go
@@ -186,11 +186,13 @@ func (e *turboOCIBuilderEngine) UploadImage(ctx context.Context) error {
 			label.OverlayBDBlobSize:   "4737695",
 		},
 	}
-	if err := uploadBlob(ctx, e.pusher, overlaybdBaseLayer, baseDesc); err != nil {
-		return errors.Wrapf(err, "failed to upload baselayer %q", overlaybdBaseLayer)
+	if !e.mkfs {
+		if err := uploadBlob(ctx, e.pusher, overlaybdBaseLayer, baseDesc); err != nil {
+			return errors.Wrapf(err, "failed to upload baselayer %q", overlaybdBaseLayer)
+		}
+		e.manifest.Layers = append([]specs.Descriptor{baseDesc}, e.manifest.Layers...)
+		e.config.RootFS.DiffIDs = append([]digest.Digest{baseDesc.Digest}, e.config.RootFS.DiffIDs...)
 	}
-	e.manifest.Layers = append([]specs.Descriptor{baseDesc}, e.manifest.Layers...)
-	e.config.RootFS.DiffIDs = append([]digest.Digest{baseDesc.Digest}, e.config.RootFS.DiffIDs...)
 	return e.uploadManifestAndConfig(ctx)
 }