Skip to content

Commit

Permalink
Fix the fs-version annotation error of the converted Nydus bootstrap …
Browse files Browse the repository at this point in the history
…layer.

By now, the "containerd.io/snapshot/nydus-fs-version" annotation of the converted bootstrap layer is always `5` which is the default value. The reason for this error is that the value of `MergeOption.FsVersion` is not assigned correctly in the `convertManifest` function of `convert_unix.go` when call the `MergeLayers` function and the `MergeLayers` always uses the empty string as the value of `MergeOption.FsVersion`.

Signed-off-by: Nan Li <[email protected]>
  • Loading branch information
loheagn committed Oct 20, 2022
1 parent 5316062 commit 7965862
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions pkg/converter/convert_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,7 @@ func convertManifest(ctx context.Context, cs content.Store, newDesc *ocispec.Des
BuilderPath: opt.BuilderPath,
WorkDir: opt.WorkDir,
ChunkDictPath: opt.ChunkDictPath,
FsVersion: opt.FsVersion,
WithTar: true,
})
if err != nil {
Expand Down

0 comments on commit 7965862

Please sign in to comment.