beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

builder-next: disable mergeop and diffop

Browse source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
(cherry picked from commit 0ac3bf837b)
Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com>
This commit is contained in:
Tonis Tiigi 2023-03-06 22:27:51 +00:00 committed by Bjorn Neergaard
parent 9740b6854d
commit d43958b50b
No known key found for this signature in database
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
builder/builder-next/controller.go
View file

@ -39,6 +39,9 @@ import (
"github.com/moby/buildkit/worker"
"github.com/pkg/errors"
bolt "go.etcd.io/bbolt"
"github.com/moby/buildkit/solver/pb"
"github.com/moby/buildkit/util/apicaps"
)
func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
@ -49,6 +52,18 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
dist := opt.Dist
root := opt.Root
pb.Caps.Init(apicaps.Cap{
ID: pb.CapMergeOp,
Enabled: false,
DisabledReasonMsg: "only enabled with containerd image store backend",
})
pb.Caps.Init(apicaps.Cap{
ID: pb.CapDiffOp,
Enabled: false,
DisabledReasonMsg: "only enabled with containerd image store backend",
})
var driver graphdriver.Driver
if ls, ok := dist.LayerStore.(interface {
Driver() graphdriver.Driver