build(deps): bump docker/setup-qemu-action from 2 to 3

.github/workflows/build.yml

@@ -47,7 +47,7 @@ jobs:
         uses: crazy-max/ghaction-github-runtime@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -106,7 +106,7 @@ jobs:
         uses: crazy-max/ghaction-github-runtime@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -163,7 +163,7 @@ jobs:
         uses: crazy-max/ghaction-github-runtime@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -310,7 +310,7 @@ jobs:
         uses: crazy-max/ghaction-github-runtime@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -370,7 +370,7 @@ jobs:
         uses: crazy-max/ghaction-github-runtime@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -406,7 +406,7 @@ jobs:
         uses: crazy-max/ghaction-github-runtime@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
@@ -478,7 +478,7 @@ jobs:
         uses: crazy-max/ghaction-github-runtime@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

.github/workflows/dockerd.yml

@@ -108,7 +108,7 @@ jobs:
         uses: crazy-max/ghaction-github-runtime@v2
       -
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

Dockerfile

@@ -10,7 +10,7 @@ ARG CNI_VERSION=v1.1.1
 ARG STARGZ_SNAPSHOTTER_VERSION=v0.13.0
 ARG NERDCTL_VERSION=v1.0.0
 ARG DNSNAME_VERSION=v1.3.1
-ARG NYDUS_VERSION=v2.1.0
+ARG NYDUS_VERSION=v2.1.6
 
 ARG ALPINE_VERSION=3.17
 

docs/nydus.md

@@ -16,7 +16,7 @@ go build -tags=nydus -o ./bin/buildkitd ./cmd/buildkitd
 
 ### Building Nydus with BuildKit
 
-Download `nydus-image` binary from [nydus release page](https://github.com/dragonflyoss/image-service/releases) (require v2.1.1 or higher), then put the `nydus-image` binary path into $PATH or specifying it on `NYDUS_BUILDER` environment variable for buildkitd:
+Download `nydus-image` binary from [nydus release page](https://github.com/dragonflyoss/image-service/releases) (require v2.1.6 or higher), then put the `nydus-image` binary path into $PATH or specifying it on `NYDUS_BUILDER` environment variable for buildkitd:
 
 ```
 env NYDUS_BUILDER=/path/to/nydus-image buildkitd ...
@@ -33,7 +33,7 @@ buildctl build ... \
 
 Available options:
 
-- `nydus-fs-version`: Specify nydus image filesystem version, possible values: `5`, `6`, default `5`;
+- `nydus-fs-version`: Specify nydus image filesystem version, possible values: `5`, `6`, default `6`;
 - `nydus-compressor`: Specify nydus image compressor, possible values: `none`, `lz4_block`, `zstd`, default `lz4_block`;
 - `nydus-chunk-dict-image`: Specify nydus chunk dict image reference for data de-duplication;
 

nydus/nydus.go

@@ -170,10 +170,10 @@ func loadChunkDict(ctx context.Context, registryHosts docker.RegistryHosts, sm *
 	}
 
 	if bootstrapDesc.Annotations[nydusify.LayerAnnotationFSVersion] == "" {
-		bootstrapDesc.Annotations[nydusify.LayerAnnotationFSVersion] = "5"
+		bootstrapDesc.Annotations[nydusify.LayerAnnotationFSVersion] = "6"
 	}
 	if nydusFSVersion == "" {
-		nydusFSVersion = "5"
+		nydusFSVersion = "6"
 	}
 
 	if bootstrapDesc.Annotations[nydusify.LayerAnnotationFSVersion] != nydusFSVersion {

nydus/util/util.go

@@ -15,12 +15,14 @@ type compressorKey struct{}
 type chunkDictDigestKey struct{}
 
 func WithContext(ctx context.Context, fsVersion string, compressor string, chunkDictDigest digest.Digest) context.Context {
-	if fsVersion == "" {
-		fsVersion = "5"
+	if fsVersion != "" {
+		ctx = context.WithValue(ctx, fsVersionKey{}, fsVersion)
+	}
+
+	if compressor != "" {
+		ctx = context.WithValue(ctx, compressorKey{}, compressor)
 	}
 
-	ctx = context.WithValue(ctx, fsVersionKey{}, fsVersion)
-	ctx = context.WithValue(ctx, compressorKey{}, compressor)
 	if chunkDictDigest != "" {
 		ctx = context.WithValue(ctx, chunkDictDigestKey{}, chunkDictDigest.String())
 	}
@@ -29,8 +31,8 @@ func WithContext(ctx context.Context, fsVersion string, compressor string, chunk
 }
 
 func GetContext(ctx context.Context) (string, string, string) {
-	fsVersion := ""
-	compressor := ""
+	fsVersion := "6"
+	compressor := "zstd"
 	chunkDictDigest := ""
 
 	ctxValue := ctx.Value(fsVersionKey{})

solver/llbsolver/proc/provenance.go

@@ -11,11 +11,12 @@ import (
 	"github.com/moby/buildkit/solver"
 	"github.com/moby/buildkit/solver/llbsolver"
 	"github.com/moby/buildkit/solver/result"
+	"github.com/moby/buildkit/util/compression"
 	"github.com/pkg/errors"
 )
 
 func ProvenanceProcessor(attrs map[string]string) llbsolver.Processor {
-	return func(ctx context.Context, res *llbsolver.Result, s *llbsolver.Solver, j *solver.Job) (*llbsolver.Result, error) {
+	return func(ctx context.Context, res *llbsolver.Result, s *llbsolver.Solver, j *solver.Job, comp compression.Config) (*llbsolver.Result, error) {
 		ps, err := exptypes.ParsePlatforms(res.Metadata)
 		if err != nil {
 			return nil, err
@@ -41,7 +42,7 @@ func ProvenanceProcessor(attrs map[string]string) llbsolver.Processor {
 				return nil, errors.Errorf("could not find ref %s", p.ID)
 			}
 
-			pc, err := llbsolver.NewProvenanceCreator(ctx, cp, ref, attrs, j)
+			pc, err := llbsolver.NewProvenanceCreator(ctx, cp, ref, attrs, j, comp)
 			if err != nil {
 				return nil, err
 			}

solver/llbsolver/proc/sbom.go

@@ -10,11 +10,12 @@ import (
 	"github.com/moby/buildkit/solver"
 	"github.com/moby/buildkit/solver/llbsolver"
 	"github.com/moby/buildkit/solver/result"
+	"github.com/moby/buildkit/util/compression"
 	"github.com/pkg/errors"
 )
 
 func SBOMProcessor(scannerRef string, useCache bool) llbsolver.Processor {
-	return func(ctx context.Context, res *llbsolver.Result, s *llbsolver.Solver, j *solver.Job) (*llbsolver.Result, error) {
+	return func(ctx context.Context, res *llbsolver.Result, s *llbsolver.Solver, j *solver.Job, comp compression.Config) (*llbsolver.Result, error) {
 		// skip sbom generation if we already have an sbom
 		if sbom.HasSBOM(res.Result) {
 			return res, nil

solver/llbsolver/provenance.go

@@ -20,6 +20,7 @@ import (
 	"github.com/moby/buildkit/solver/llbsolver/provenance"
 	"github.com/moby/buildkit/solver/pb"
 	"github.com/moby/buildkit/source"
+	"github.com/moby/buildkit/util/compression"
 	"github.com/moby/buildkit/worker"
 	digest "github.com/opencontainers/go-digest"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
@@ -372,7 +373,7 @@ type ProvenanceCreator struct {
 	addLayers func() error
 }
 
-func NewProvenanceCreator(ctx context.Context, cp *provenance.Capture, res solver.ResultProxy, attrs map[string]string, j *solver.Job) (*ProvenanceCreator, error) {
+func NewProvenanceCreator(ctx context.Context, cp *provenance.Capture, res solver.ResultProxy, attrs map[string]string, j *solver.Job, comp compression.Config) (*ProvenanceCreator, error) {
 	var reproducible bool
 	if v, ok := attrs["reproducible"]; ok {
 		b, err := strconv.ParseBool(v)
@@ -449,6 +450,7 @@ func NewProvenanceCreator(ctx context.Context, cp *provenance.Capture, res solve
 				ResolveRemotes: resolveRemotes,
 				Mode:           solver.CacheExportModeRemoteOnly,
 				ExportRoots:    true,
+				CompressionOpt: &comp,
 			}); err != nil {
 				return err
 			}

solver/llbsolver/solver.go

@@ -93,7 +93,7 @@ type Solver struct {
 
 // Processor defines a processing function to be applied after solving, but
 // before exporting
-type Processor func(ctx context.Context, result *Result, s *Solver, j *solver.Job) (*Result, error)
+type Processor func(ctx context.Context, result *Result, s *Solver, j *solver.Job, comp compression.Config) (*Result, error)
 
 func New(opt Opt) (*Solver, error) {
 	s := &Solver{
@@ -200,7 +200,7 @@ func (s *Solver) recordBuildHistory(ctx context.Context, id string, req frontend
 		}
 
 		makeProvenance := func(res solver.ResultProxy, cap *provenance.Capture) (*controlapi.Descriptor, func(), error) {
-			prc, err := NewProvenanceCreator(ctx2, cap, res, attrs, j)
+			prc, err := NewProvenanceCreator(ctx2, cap, res, attrs, j, exp.Exporter.Config().Compression())
 			if err != nil {
 				return nil, nil, err
 			}
@@ -501,7 +501,7 @@ func (s *Solver) Solve(ctx context.Context, id string, sessionID string, req fro
 	}
 
 	for _, post := range post {
-		res2, err := post(ctx, resProv, s, j)
+		res2, err := post(ctx, resProv, s, j, exp.Exporter.Config().Compression())
 		if err != nil {
 			return nil, err
 		}