Merge pull request #1987 from jedevc/vendor-buildkit-master-tests

go.mod

@@ -23,7 +23,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840
 	github.com/hashicorp/hcl/v2 v2.8.2
-	github.com/moby/buildkit v0.12.1-0.20230717122532-faa0cc7da353 // v0.12.1-dev
+	github.com/moby/buildkit v0.12.1-0.20230804094609-b49a8873179b
 	github.com/moby/sys/mountinfo v0.6.2
 	github.com/moby/sys/signal v0.7.0
 	github.com/morikuni/aec v1.0.0

go.sum

@@ -372,8 +372,8 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzC
 github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/moby/buildkit v0.12.1-0.20230717122532-faa0cc7da353 h1:/ZIwqvOF3QKObJbjX96xVvAKtnWdw/AuEqysbbujaZA=
+github.com/moby/buildkit v0.12.1-0.20230804094609-b49a8873179b h1:LUpEbvxcyM0NuWk54WwNjDVZ5YujyCm1CudzZpqaohE=
-github.com/moby/buildkit v0.12.1-0.20230717122532-faa0cc7da353/go.mod h1:+n9GmkxwBCjVz4u7wmiyh+oqvjIjQM+1zk3iJrWfdos=
+github.com/moby/buildkit v0.12.1-0.20230804094609-b49a8873179b/go.mod h1:bs0LeDdh7AQpYXLiPNUt+hzDjRxMg+QeLq1a1r0awFM=
 github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
 github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=

tests/build.go

@@ -141,7 +141,7 @@ func testImageIDOutput(t *testing.T, sb integration.Sandbox) {
 
 	outFlag := "--output=type=docker"
 
-	if sb.Name() == "remote" {
+	if sb.DockerAddress() == "" {
 		// there is no Docker atm to load the image
 		outFlag += ",dest=" + targetDir + "/image.tar"
 	}
@@ -210,14 +210,15 @@ func testBuildMobyFromLocalImage(t *testing.T, sb integration.Sandbox) {
 	require.NoError(t, cmd.Run())
 
 	// create local tag matching a remote one
-	cmd = dockerCmd(sb, withArgs("tag", "busybox:latest", "busybox:1.36"))
+	cmd = dockerCmd(sb, withArgs("tag", "busybox:latest", "busybox:1.35"))
 	cmd.Stderr = os.Stderr
 	require.NoError(t, cmd.Run())
 
 	// build image and check that it uses the local tag
+	// (note: the version check should match the version of busybox in pins.go)
 	dockerfile = []byte(`
-FROM busybox:1.36
+FROM busybox:1.35
-RUN busybox | head -1 | grep v1.35.0
+RUN busybox | head -1 | grep v1.36.1
 `)
 	dir = tmpdir(t, fstest.CreateFile("Dockerfile", dockerfile, 0600))
 	cmd = buildxCmd(

tests/integration_test.go

@@ -7,10 +7,11 @@ import (
 	"github.com/docker/buildx/tests/workers"
 	"github.com/docker/distribution/reference"
 	"github.com/moby/buildkit/util/testutil/integration"
+	bkworkers "github.com/moby/buildkit/util/testutil/workers"
 )
 
 func init() {
-	if integration.IsTestDockerd() {
+	if bkworkers.IsTestDockerd() {
 		workers.InitDockerWorker()
 		workers.InitDockerContainerWorker()
 	} else {
@@ -32,7 +33,7 @@ func TestIntegration(t *testing.T) {
 func testIntegration(t *testing.T, funcs ...func(t *testing.T, sb integration.Sandbox)) {
 	mirroredImages := integration.OfficialImages("busybox:latest", "alpine:latest")
 	buildkitImage := "docker.io/moby/buildkit:buildx-stable-1"
-	if integration.IsTestDockerd() {
+	if bkworkers.IsTestDockerd() {
 		if img, ok := os.LookupEnv("TEST_BUILDKIT_IMAGE"); ok {
 			ref, err := reference.ParseNormalizedNamed(img)
 			if err == nil {

tests/workers/backend.go

@@ -1,10 +1,20 @@
 package workers
 
+import (
+	"os"
+	"strings"
+
+	"github.com/moby/buildkit/util/testutil/integration"
+)
+
 type backend struct {
 	builder             string
 	context             string
+	unsupportedFeatures []string
 }
 
+var _ integration.Backend = &backend{}
+
 func (s *backend) Address() string {
 	return s.builder
 }
@@ -24,3 +34,26 @@ func (s *backend) Snapshotter() string {
 func (s *backend) Rootless() bool {
 	return false
 }
+
+func (s backend) Supports(feature string) bool {
+	if enabledFeatures := os.Getenv("BUILDKIT_TEST_ENABLE_FEATURES"); enabledFeatures != "" {
+		for _, enabledFeature := range strings.Split(enabledFeatures, ",") {
+			if feature == enabledFeature {
+				return true
+			}
+		}
+	}
+	if disabledFeatures := os.Getenv("BUILDKIT_TEST_DISABLE_FEATURES"); disabledFeatures != "" {
+		for _, disabledFeature := range strings.Split(disabledFeatures, ",") {
+			if feature == disabledFeature {
+				return false
+			}
+		}
+	}
+	for _, unsupportedFeature := range s.unsupportedFeatures {
+		if feature == unsupportedFeature {
+			return false
+		}
+	}
+	return true
+}

tests/workers/docker-container.go

@@ -20,6 +20,8 @@ func InitDockerContainerWorker() {
 type containerWorker struct {
 	id string
 
+	unsupported []string
+
 	docker      integration.Backend
 	dockerClose func() error
 	dockerErr   error
@@ -67,6 +69,7 @@ func (w *containerWorker) New(ctx context.Context, cfg *integration.BackendConfi
 	return &backend{
 		context:             w.docker.DockerAddress(),
 		builder:             name,
+		unsupportedFeatures: w.unsupported,
 	}, cl, nil
 }
 

tests/workers/docker.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/moby/buildkit/identity"
 	"github.com/moby/buildkit/util/testutil/integration"
+	bkworkers "github.com/moby/buildkit/util/testutil/workers"
 	"github.com/pkg/errors"
 )
 
@@ -23,6 +24,7 @@ func InitDockerWorker() {
 type dockerWorker struct {
 	id                    string
 	containerdSnapshotter bool
+	unsupported           []string
 }
 
 func (c dockerWorker) Name() string {
@@ -34,7 +36,7 @@ func (c dockerWorker) Rootless() bool {
 }
 
 func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) {
-	moby := integration.Moby{
+	moby := bkworkers.Moby{
 		ID:                    c.id,
 		ContainerdSnapshotter: c.containerdSnapshotter,
 	}
@@ -68,6 +70,7 @@ func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
 	return &backend{
 		builder:             name,
 		context:             name,
+		unsupportedFeatures: c.unsupported,
 	}, cl, nil
 }
 

tests/workers/features.go

@@ -0,0 +1,13 @@
+package workers
+
+import (
+	"testing"
+
+	"github.com/moby/buildkit/util/testutil/integration"
+)
+
+var features = map[string]struct{}{}
+
+func CheckFeatureCompat(t *testing.T, sb integration.Sandbox, reason ...string) {
+	integration.CheckFeatureCompat(t, sb, features, reason...)
+}

tests/workers/remote.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/moby/buildkit/identity"
 	"github.com/moby/buildkit/util/testutil/integration"
+	bkworkers "github.com/moby/buildkit/util/testutil/workers"
 	"github.com/pkg/errors"
 )
 
@@ -18,6 +19,7 @@ func InitRemoteWorker() {
 
 type remoteWorker struct {
 	id          string
+	unsupported []string
 }
 
 func (w remoteWorker) Name() string {
@@ -29,7 +31,7 @@ func (w remoteWorker) Rootless() bool {
 }
 
 func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) {
-	oci := integration.OCI{ID: w.id}
+	oci := bkworkers.OCI{ID: w.id}
 	bk, bkclose, err := oci.New(ctx, cfg)
 	if err != nil {
 		return bk, cl, err
@@ -61,6 +63,7 @@ func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
 
 	return &backend{
 		builder:             name,
+		unsupportedFeatures: w.unsupported,
 	}, cl, nil
 }
 

vendor/github.com/moby/buildkit/AUTHORS

@@ -1,66 +1,284 @@
 # This file lists all individuals having contributed content to the repository.
-# For how it is generated, see `scripts/generate-authors.sh`.
+# For how it is generated, see hack/dockerfiles/authors.Dockerfile.
 
+a-palchikov <deemok@gmail.com>
 Aaron L. Xu <likexu@harmonycloud.cn>
 Aaron Lehmann <aaron.lehmann@docker.com>
+Aaron Lehmann <alehmann@netflix.com>
+Abdur Rehman <abdur_rehman@mentor.com>
+Addam Hardy <addam.hardy@gmail.com>
+Adrian Plata <adrian.plata@docker.com>
+Aidan Hobson Sayers <aidanhs@cantab.net>
 Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
+Alan Fregtman <941331+darkvertex@users.noreply.github.com>
+Alex Couture-Beil <alex@earthly.dev>
+Alex Mayer <amayer5125@gmail.com>
+Alex Suraci <suraci.alex@gmail.com>
 Alexander Morozov <lk4d4@docker.com>
+Alexis Murzeau <amubtdx@gmail.com>
 Alice Frosi <afrosi@de.ibm.com>
 Allen Sun <allen.sun@daocloud.io>
+Amen Belayneh <amenbelayneh@gmail.com>
+Anca Iordache <anca.iordache@docker.com>
 Anda Xu <anda.xu@docker.com>
+Anders F Björklund <anders.f.bjorklund@gmail.com>
+Andrea Bolognani <abologna@redhat.com>
+Andrea Luzzardi <aluzzardi@gmail.com>
+Andrew Chang <chang331006@gmail.com>
+Andrey Smirnov <smirnov.andrey@gmail.com>
+Andy Alt <andy5995@users.noreply.github.com>
+Andy Caldwell <andrew.caldwell@metaswitch.com>
+Ankush Agarwal <ankushagarwal11@gmail.com>
 Anthony Sottile <asottile@umich.edu>
+Anurag Goel <anurag@render.com>
+Anusha Ragunathan <anusha@docker.com>
 Arnaud Bailly <arnaud.oqube@gmail.com>
+Avi Deitcher <avi@deitcher.net>
+Bastiaan Bakker <bbakker@xebia.com>
+Ben Longo <benlongo9807@gmail.com>
+Bertrand Paquet <bertrand.paquet@gmail.com>
 Bin Liu <liubin0329@gmail.com>
+Brandon Mitchell <git@bmitch.net>
 Brian Goff <cpuguy83@gmail.com>
+Ce Gao <ce.gao@outlook.com>
+Chaerim Yeo <yeochaerim@gmail.com>
+Changwei Ge <gechangwei@bytedance.com>
+Chanhun Jeong <chanhun.jeong@navercorp.com>
+ChaosGramer <ChaosGramer@users.noreply.github.com>
+Charles Chan <charleswhchan@users.noreply.github.com>
+Charles Korn <me@charleskorn.com>
+Charles Law <claw@conduce.com>
+Chenbin <chen.bin11@zte.com.cn>
+Chris Goller <goller@gmail.com>
+Chris McKinnel <chrismckinnel@gmail.com>
+Christian Höltje <docwhat@gerf.org>
+Christian Weichel <chris@gitpod.io>
+Ciro S. Costa <cscosta@pivotal.io>
+Claudiu Belu <cbelu@cloudbasesolutions.com>
+Colin Chartier <colin.n.chartier@gmail.com>
+Corey Larson <corey@earthly.dev>
+Cory Bennett <cbennett@netflix.com>
+Cory Snider <csnider@mirantis.com>
+coryb <cbennett@netflix.com>
+CrazyMax <github@crazymax.dev>
+Csaba Apagyi <csaba.apagyi@gmail.com>
+Dan Duvall <dduvall@wikimedia.org>
+Daniel Cassidy <mail@danielcassidy.me.uk>
 Daniel Nephin <dnephin@gmail.com>
+Darren Shepherd <darren@rancher.com>
 Dave Chen <dave.chen@arm.com>
+Dave Henderson <dhenderson@gmail.com>
+Dave Tucker <dt@docker.com>
 David Calavera <david.calavera@gmail.com>
+David Dooling <dooling@gmail.com>
+David Gageot <david.gageot@docker.com>
+David Karlsson <david.karlsson@docker.com>
+Davis Schirmer <djds@bghost.xyz>
 Dennis Chen <dennis.chen@arm.com>
+dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 Derek McGowan <derek@mcgstyle.net>
+Dharmit Shah <shahdharmit@gmail.com>
+Ding Fei <dingfei@stars.org.cn>
+dito <itodaisuke00@gmail.com>
 Doug Davis <dug@us.ibm.com>
-Edgar Lee <edgarl@netflix.com>
+Edgar Lee <edgarhinshunlee@gmail.com>
 Eli Uriegas <eli.uriegas@docker.com>
+Elias Faxö <elias.faxo@tre.se>
+Eng Zer Jun <engzerjun@gmail.com>
+Eric Engestrom <eric@engestrom.ch>
+Erik Sipsma <erik@sipsma.dev>
+eyherabh <hugogabriel.eyherabide@gmail.com>
 f0 <f0@users.noreply.github.com>
 Fernando Miguel <github@FernandoMiguel.net>
+Fiona Klute <fiona.klute@gmx.de>
+Foysal Iqbal <foysal.iqbal.fb@gmail.com>
+Fred Cox <mcfedr@gmail.com>
+Frieder Bluemle <frieder.bluemle@gmail.com>
+Gabriel <samfiragabriel@gmail.com>
+Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
+Gaetan de Villele <gdevillele@gmail.com>
+Gahl Saraf <saraf.gahl@gmail.com>
+genglu.gl <luzigeng32@163.com>
+George <george@betterde.com>
+ggjulio <juligonz@student.42.fr>
+Govind Rai <raigovind93@gmail.com>
+Grant Reaber <grant.reaber@gmail.com>
+Guilhem C <guilhem.charles@gmail.com>
+Hans van den Bogert <hansbogert@gmail.com>
 Hao Hu <hao.hu.fr@gmail.com>
+Hector S <hfsam88@gmail.com>
 Helen Xie <chenjg@harmonycloud.cn>
 Himanshu Pandey <hpandey@pivotal.io>
 Hiromu Nakamura <abctail30@gmail.com>
+HowJMay <vulxj0j8j8@gmail.com>
+Hugo Santos <hugo@namespacelabs.com>
 Ian Campbell <ijc@docker.com>
+Ilya Dmitrichenko <errordeveloper@gmail.com>
 Iskander (Alex) Sharipov <quasilyte@gmail.com>
+Jacob Gillespie <jacobwgillespie@gmail.com>
+Jacob MacElroy <jacob@okteto.com>
 Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
+Jeffrey Huang <jeffreyhuang23@gmail.com>
+Jesse Rittner <rittneje@gmail.com>
 Jessica Frazelle <acidburn@microsoft.com>
+jgeiger <jgeiger@gmail.com>
+Jitender Kumar <jitender.kumar@intel.com>
+jlecordier <jeanlecordier@hotmail.fr>
+joey <zchengjoey@gmail.com>
 John Howard <jhoward@microsoft.com>
+John Maguire <jmaguire@duosecurity.com>
+John Mulhausen <john@docker.com>
+John Tims <john.k.tims@gmail.com>
+Jon Zeolla <zeolla@gmail.com>
+Jonathan Azoff <azoff@users.noreply.github.com>
+Jonathan Giannuzzi <jonathan@giannuzzi.me>
 Jonathan Stoppani <jonathan.stoppani@divio.com>
+Jonny Stoten <jonny.stoten@docker.com>
+JordanGoasdoue <jordan.goasdoue@dailymotion.com>
+jroenf <jeroenfranse@gmail.com>
+Julian Goede <julian.goede@pm.me>
 Justas Brazauskas <brazauskasjustas@gmail.com>
+Justin Chadwell <me@jedevc.com>
 Justin Cormack <justin.cormack@docker.com>
+Justin Garrison <justin@linux.com>
+Jörg Franke <359489+NewJorg@users.noreply.github.com>
+Kang, Matthew <impulsecss@gmail.com>
+Kees Cook <keescook@chromium.org>
+Kevin Burke <kev@inburke.com>
+kevinmeredith <kevin.m.meredith@gmail.com>
+Kir Kolyshkin <kolyshkin@gmail.com>
+Kohei Tokunaga <ktokunaga.mail@gmail.com>
+Koichi Shiraishi <zchee.io@gmail.com>
+Kris-Mikael Krister <krismikael@protonmail.com>
 Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
+Kyle <Kylemit@gmail.com>
+l00397676 <lujingxiao@huawei.com>
 Lajos Papp <lalyos@yahoo.com>
+lalyos <lalyos@yahoo.com>
+Levi Harrison <levisamuelharrison@gmail.com>
+liwenqi <vikilwq@zju.edu.cn>
+lixiaobing10051267 <li.xiaobing1@zte.com.cn>
+lomot <lomot@qq.com>
+Lu Jingxiao <lujingxiao@huawei.com>
+Luca Visentin <luck.visentin@gmail.com>
+Maciej Kalisz <mdkalish@users.noreply.github.com>
+Madhav Puri <madhav.puri@gmail.com>
+Manu Gupta <manugupt1@gmail.com>
+Marcus Comstedt <marcus@mc.pp.se>
+Mark Gordon <msg555@gmail.com>
+Marko Kohtala <marko.kohtala@gmail.com>
+Mary Anthony <mary@docker.com>
+masibw <masi19bw@gmail.com>
+Matias Insaurralde <matias@insaurral.de>
+Matt Kang <impulsecss@gmail.com>
 Matt Rickard <mrick@google.com>
+Maxime Lagresle <maxime@angel.co>
 Michael Crosby <crosbymichael@gmail.com>
+Michael Friis <friism@gmail.com>
+Michael Irwin <mikesir87@gmail.com>
+Miguel Ángel Jimeno <miguelangel4b@gmail.com>
+Mihai Borobocea <MihaiBorob@gmail.com>
+Mike Brown <brownwm@us.ibm.com>
+mikelinjie <294893458@qq.com>
+Mikhail Vasin <vasin@cloud-tv.ru>
+Misty Stanley-Jones <misty@docker.com>
 Miyachi Katsuya <miyachi_katsuya@r.recruit.co.jp>
+Morgan Bauer <mbauer@us.ibm.com>
+Morlay <morlay.null@gmail.com>
+msg <msg@clinc.com>
 Nao YONASHIRO <yonashiro@r.recruit.co.jp>
 Natasha Jarus <linuxmercedes@gmail.com>
+Nathan Sullivan <nathan@nightsys.net>
+Nick Miyake <nmiyake@users.noreply.github.com>
+Nick Santos <nick.santos@docker.com>
+Nikhil Pandeti <nikhil.pandeti@utexas.edu>
 Noel Georgi <18496730+frezbo@users.noreply.github.com>
+Oliver Bristow <oliver.bristow@project-tracr.com>
+Omer Duchovne <79370724+od-cyera@users.noreply.github.com>
+Omer Mizrahi <ommizrah@microsoft.com>
 Ondrej Fabry <ofabry@cisco.com>
+Otto Kekäläinen <otto@seravo.fi>
+Pablo Chico de Guzman <pchico83@gmail.com>
+Patrick Hemmer <patrick.hemmer@gmail.com>
+Patrick Lang <plang@microsoft.com>
 Patrick Van Stee <patrick@vanstee.me>
+Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
+Paweł Gronowski <pawel.gronowski@docker.com>
+Peter Dave Hello <hsu@peterdavehello.org>
+Petr Fedchenkov <giggsoff@gmail.com>
+Phil Estes <estesp@gmail.com>
+Pierre Fenoll <pierrefenoll@gmail.com>
+pieterdd <pieterdd@users.noreply.github.com>
+Pranav Pandit <pranavp@microsoft.com>
+Pratik Raj <rajpratik71@gmail.com>
+Prayag Verma <prayag.verma@gmail.com>
+Qiang Huang <h.huangqiang@huawei.com>
+Remy Suen <remy.suen@gmail.com>
 Ri Xu <xuri.me@gmail.com>
+Rob Taylor <rob@shape.build>
+Robert Estelle <robertestelle@gmail.com>
+Rubens Figueiredo <r.figueiredo.52@gmail.com>
+Sam Whited <sam@samwhited.com>
+Sascha Schwarze <schwarzs@de.ibm.com>
+Sean P. Kane <spkane00@gmail.com>
 Sebastiaan van Stijn <github@gone.nl>
+Seiya Miyata <odradek38@gmail.com>
+Serhat Gülçiçek <serhat25@gmail.com>
+Sertac Ozercan <sozercan@gmail.com>
 Shev Yan <yandong_8212@163.com>
+Shijiang Wei <mountkin@gmail.com>
+Shingo Omura <everpeace@gmail.com>
+Shiwei Zhang <shizh@microsoft.com>
+Siebe Schaap <siebe@digibites.nl>
+Silvin Lubecki <31478878+silvin-lubecki@users.noreply.github.com>
 Simon Ferquel <simon.ferquel@docker.com>
+Slava Semushin <semushin@redhat.com>
+Solomon Hykes <sh.github.6811@hykes.org>
+squeegels <1674195+squeegels@users.noreply.github.com>
+Stefan Scherer <stefan.scherer@docker.com>
 Stefan Weil <sw@weilnetz.de>
+StefanSchoof <Stefan.Schoof@direkt-gruppe.de>
+Stepan Blyshchak <stepanblischak@gmail.com>
+Steve Lohr <schdief.law@gmail.com>
+sunchunming <sunchunming1@jd.com>
+Sven Dowideit <SvenDowideit@home.org.au>
+Takuya Noguchi <takninnovationresearch@gmail.com>
 Thomas Leonard <thomas.leonard@docker.com>
+Thomas Riccardi <riccardi@systran.fr>
 Thomas Shaw <tomwillfixit@users.noreply.github.com>
+Tianon Gravi <admwiggin@gmail.com>
 Tibor Vass <tibor@docker.com>
 Tiffany Jernigan <tiffany.f.j@gmail.com>
+Tim Waugh <twaugh@redhat.com>
+Tim Wraight <tim.wraight@tangentlabs.co.uk>
 Tino Rusch <tino.rusch@gmail.com>
 Tobias Klauser <tklauser@distanz.ch>
 Tomas Tomecek <ttomecek@redhat.com>
+Tomasz Kopczynski <tomek@kopczynski.net.pl>
 Tomohiro Kusumoto <zabio1192@gmail.com>
+Troels Liebe Bentsen <tlb@nversion.dk>
 Tõnis Tiigi <tonistiigi@gmail.com>
+Valentin Lorentz <progval+git@progval.net>
+Vasek - Tom C <tom.chauveau@epitech.eu>
+Victor Vieux <victorvieux@gmail.com>
+Victoria Bialas <victoria.bialas@docker.com>
 Vincent Demeester <vincent.demeester@docker.com>
+Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
+Vladislav Ivanov <vlad@ivanov.email>
+Wang Yumu <37442693@qq.com>
 Wei Fu <fuweid89@gmail.com>
+Wei Zhang <kweizh@gmail.com>
+wingkwong <wingkwong.code@gmail.com>
+Xiaofan Zhang <xiaofan.zhang@clinc.com>
+Ximo Guanter <ximo.guanter@gmail.com>
+Yamazaki Masashi <masi19bw@gmail.com>
+Yan Song <imeoer@linux.alibaba.com>
 Yong Tang <yong.tang.github@outlook.com>
 Yuichiro Kaneko <spiketeika@gmail.com>
+Yurii Rashkovskii <yrashk@gmail.com>
+Zach Badgett <zach.badgett@gmail.com>
+zhangwenlong <zhangwenlong8911@163.com>
 Ziv Tsarfati <digger18@gmail.com>
+岁丰 <genglu.gl@antfin.com>
+沈陵 <shenling.yyb@alibaba-inc.com>
 郑泽宇 <perhapszzy@sina.com>

vendor/github.com/moby/buildkit/client/llb/state.go

@@ -267,7 +267,7 @@ func (s State) WithImageConfig(c []byte) (State, error) {
 	return s, nil
 }
 
-// Run performs the command specified by the arguments within the contexst of the current [State].
+// Run performs the command specified by the arguments within the context of the current [State].
 // The command is executed as a container with the [State]'s filesystem as the root filesystem.
 // As such any command you run must be present in the [State]'s filesystem.
 // Constraints such as [State.Ulimit], [State.ParentCgroup], [State.Network], etc. are applied to the container.

vendor/github.com/moby/buildkit/frontend/dockerfile/dockerignore/dockerignore.go

@@ -6,23 +6,31 @@ import (
 	"io"
 	"path/filepath"
 	"strings"
-
-	"github.com/pkg/errors"
 )
 
-// ReadAll reads a .dockerignore file and returns the list of file patterns
+// ReadAll reads an ignore file from a reader and returns the list of file
-// to ignore. Note this will trim whitespace from each line as well
+// patterns to ignore, applying the following rules:
-// as use GO's "clean" func to get the shortest/cleanest path for each.
+//
+//   - An UTF8 BOM header (if present) is stripped.
+//   - Lines starting with "#" are considered comments and are skipped.
+//
+// For remaining lines:
+//
+//   - Leading and trailing whitespace is removed from each ignore pattern.
+//   - It uses [filepath.Clean] to get the shortest/cleanest path for
+//     ignore patterns.
+//   - Leading forward-slashes ("/") are removed from ignore patterns,
+//     so "/some/path" and "some/path" are considered equivalent.
 func ReadAll(reader io.Reader) ([]string, error) {
 	if reader == nil {
 		return nil, nil
 	}
 
-	scanner := bufio.NewScanner(reader)
 	var excludes []string
 	currentLine := 0
-
 	utf8bom := []byte{0xEF, 0xBB, 0xBF}
+
+	scanner := bufio.NewScanner(reader)
 	for scanner.Scan() {
 		scannedBytes := scanner.Bytes()
 		// We trim UTF8 BOM
@@ -59,7 +67,7 @@ func ReadAll(reader io.Reader) ([]string, error) {
 		excludes = append(excludes, pattern)
 	}
 	if err := scanner.Err(); err != nil {
-		return nil, errors.Wrap(err, "error reading .dockerignore")
+		return nil, err
 	}
 	return excludes, nil
 }

vendor/github.com/moby/buildkit/frontend/dockerui/config.go

@@ -81,6 +81,7 @@ type Client struct {
 	bopts       client.BuildOpts
 
 	dockerignore     []byte
+	dockerignoreName string
 }
 
 type SBOM struct {
@@ -375,6 +376,7 @@ func (bc *Client) ReadEntrypoint(ctx context.Context, lang string, opts ...llb.L
 	})
 	if err == nil {
 		bc.dockerignore = dt
+		bc.dockerignoreName = bctx.filename + ".dockerignore"
 	}
 
 	return &Source{
@@ -435,13 +437,14 @@ func (bc *Client) MainContext(ctx context.Context, opts ...llb.LocalOption) (*ll
 			dt = []byte{}
 		}
 		bc.dockerignore = dt
+		bc.dockerignoreName = DefaultDockerignoreName
 	}
 
 	var excludes []string
 	if len(bc.dockerignore) != 0 {
 		excludes, err = dockerignore.ReadAll(bytes.NewBuffer(bc.dockerignore))
 		if err != nil {
-			return nil, errors.Wrap(err, "failed to parse dockerignore")
+			return nil, errors.Wrapf(err, "failed parsing %s", bc.dockerignoreName)
 		}
 	}
 

vendor/github.com/moby/buildkit/frontend/dockerui/namedcontext.go

@@ -208,7 +208,7 @@ func (bc *Client) namedContextRecursive(ctx context.Context, name string, nameWi
 			if len(dt) != 0 {
 				excludes, err = dockerignore.ReadAll(bytes.NewBuffer(dt))
 				if err != nil {
-					return nil, nil, err
+					return nil, nil, errors.Wrapf(err, "failed parsing %s", DefaultDockerignoreName)
 				}
 			}
 		}

vendor/github.com/moby/buildkit/session/filesync/filesync.go

@@ -21,7 +21,6 @@ import (
 )
 
 const (
-	keyOverrideExcludes   = "override-excludes"
 	keyIncludePatterns    = "include-patterns"
 	keyExcludePatterns    = "exclude-patterns"
 	keyFollowPaths        = "followpaths"
@@ -37,7 +36,6 @@ type fsSyncProvider struct {
 
 type SyncedDir struct {
 	Dir string
-	Excludes []string
 	Map func(string, *fstypes.Stat) fsutil.MapResult
 }
 
@@ -99,9 +97,6 @@ func (sp *fsSyncProvider) handle(method string, stream grpc.ServerStream) (retEr
 	}
 
 	excludes := opts[keyExcludePatterns]
-	if len(dir.Excludes) != 0 && (len(opts[keyOverrideExcludes]) == 0 || opts[keyOverrideExcludes][0] != "true") {
-		excludes = dir.Excludes
-	}
 	includes := opts[keyIncludePatterns]
 
 	followPaths := opts[keyFollowPaths]
@@ -159,7 +154,6 @@ type FSSendRequestOpt struct {
 	IncludePatterns []string
 	ExcludePatterns []string
 	FollowPaths     []string
-	OverrideExcludes bool // deprecated: this is used by docker/cli for automatically loading .dockerignore from the directory
 	DestDir         string
 	CacheUpdater    CacheUpdater
 	ProgressCb      func(int, bool)
@@ -188,9 +182,6 @@ func FSSync(ctx context.Context, c session.Caller, opt FSSendRequestOpt) error {
 	}
 
 	opts := make(map[string][]string)
-	if opt.OverrideExcludes {
-		opts[keyOverrideExcludes] = []string{"true"}
-	}
 
 	if opt.IncludePatterns != nil {
 		opts[keyIncludePatterns] = opt.IncludePatterns

vendor/github.com/moby/buildkit/util/appdefaults/appdefaults_unix.go

@@ -70,3 +70,13 @@ func UserConfigDir() string {
 	}
 	return ConfigDir
 }
+
+func TraceSocketPath(inUserNS bool) string {
+	if inUserNS {
+		if xrd := os.Getenv("XDG_RUNTIME_DIR"); xrd != "" {
+			dirs := strings.Split(xrd, ":")
+			return filepath.Join(dirs[0], "buildkit", "otel-grpc.sock")
+		}
+	}
+	return "/run/buildkit/otel-grpc.sock"
+}

vendor/github.com/moby/buildkit/util/appdefaults/appdefaults_windows.go

@@ -31,3 +31,7 @@ func UserRoot() string {
 func UserConfigDir() string {
 	return ConfigDir
 }
+
+func TraceSocketPath(inUserNS bool) string {
+	return `\\.\pipe\buildkit-otel-grpc`
+}

vendor/github.com/moby/buildkit/util/progress/progresswriter/reset.go

@@ -27,7 +27,9 @@ func ResetTime(in Writer) Writer {
 					}
 				}
 				if w.diff != nil {
+					vertexes := make([]*client.Vertex, 0, len(st.Vertexes))
 					for _, v := range st.Vertexes {
+						v := *v
 						if v.Started != nil {
 							d := v.Started.Add(-*w.diff)
 							v.Started = &d
@@ -36,8 +38,12 @@ func ResetTime(in Writer) Writer {
 							d := v.Completed.Add(-*w.diff)
 							v.Completed = &d
 						}
+						vertexes = append(vertexes, &v)
 					}
+
+					statuses := make([]*client.VertexStatus, 0, len(st.Statuses))
 					for _, v := range st.Statuses {
+						v := *v
 						if v.Started != nil {
 							d := v.Started.Add(-*w.diff)
 							v.Started = &d
@@ -47,9 +53,21 @@ func ResetTime(in Writer) Writer {
 							v.Completed = &d
 						}
 						v.Timestamp = v.Timestamp.Add(-*w.diff)
+						statuses = append(statuses, &v)
 					}
+
+					logs := make([]*client.VertexLog, 0, len(st.Logs))
 					for _, v := range st.Logs {
+						v := *v
 						v.Timestamp = v.Timestamp.Add(-*w.diff)
+						logs = append(logs, &v)
+					}
+
+					st = &client.SolveStatus{
+						Vertexes: vertexes,
+						Statuses: statuses,
+						Logs:     logs,
+						Warnings: st.Warnings,
 					}
 				}
 				in.Status() <- st

vendor/github.com/moby/buildkit/util/testutil/integration/azurite.go

@@ -1,89 +0,0 @@
-package integration
-
-import (
-	"fmt"
-	"net"
-	"net/http"
-	"os"
-	"os/exec"
-	"testing"
-	"time"
-
-	"github.com/pkg/errors"
-)
-
-const (
-	azuriteBin = "azurite-blob"
-)
-
-type AzuriteOpts struct {
-	AccountName string
-	AccountKey  string
-}
-
-func NewAzuriteServer(t *testing.T, sb Sandbox, opts AzuriteOpts) (address string, cl func() error, err error) {
-	t.Helper()
-
-	if _, err := exec.LookPath(azuriteBin); err != nil {
-		return "", nil, errors.Wrapf(err, "failed to lookup %s binary", azuriteBin)
-	}
-
-	deferF := &multiCloser{}
-	cl = deferF.F()
-
-	defer func() {
-		if err != nil {
-			deferF.F()()
-			cl = nil
-		}
-	}()
-
-	l, err := net.Listen("tcp", "localhost:0")
-	if err != nil {
-		return "", nil, err
-	}
-
-	addr := l.Addr().String()
-	if err = l.Close(); err != nil {
-		return "", nil, err
-	}
-	host, port, err := net.SplitHostPort(addr)
-	if err != nil {
-		return "", nil, err
-	}
-	address = fmt.Sprintf("http://%s/%s", addr, opts.AccountName)
-
-	// start server
-	cmd := exec.Command(azuriteBin, "--disableProductStyleUrl", "--blobHost", host, "--blobPort", port, "--location", t.TempDir())
-	cmd.Env = append(os.Environ(), []string{
-		"AZURITE_ACCOUNTS=" + opts.AccountName + ":" + opts.AccountKey,
-	}...)
-	azuriteStop, err := startCmd(cmd, sb.Logs())
-	if err != nil {
-		return "", nil, err
-	}
-	if err = waitAzurite(address, 15*time.Second); err != nil {
-		azuriteStop()
-		return "", nil, errors.Wrapf(err, "azurite did not start up: %s", formatLogs(sb.Logs()))
-	}
-	deferF.append(azuriteStop)
-
-	return
-}
-
-func waitAzurite(address string, d time.Duration) error {
-	step := 1 * time.Second
-	i := 0
-	for {
-		if resp, err := http.Get(fmt.Sprintf("%s?comp=list", address)); err == nil {
-			resp.Body.Close()
-			break
-		}
-		i++
-		if time.Duration(i)*step > d {
-			return errors.Errorf("failed dialing: %s", address)
-		}
-		time.Sleep(step)
-	}
-	return nil
-}

vendor/github.com/moby/buildkit/util/testutil/integration/minio.go

@@ -1,116 +0,0 @@
-package integration
-
-import (
-	"fmt"
-	"net"
-	"net/http"
-	"os"
-	"os/exec"
-	"testing"
-	"time"
-
-	"github.com/pkg/errors"
-)
-
-const (
-	minioBin = "minio"
-	mcBin    = "mc"
-)
-
-type MinioOpts struct {
-	Region          string
-	AccessKeyID     string
-	SecretAccessKey string
-}
-
-func NewMinioServer(t *testing.T, sb Sandbox, opts MinioOpts) (address string, bucket string, cl func() error, err error) {
-	t.Helper()
-	bucket = randomString(10)
-
-	if _, err := exec.LookPath(minioBin); err != nil {
-		return "", "", nil, errors.Wrapf(err, "failed to lookup %s binary", minioBin)
-	}
-	if _, err := exec.LookPath(mcBin); err != nil {
-		return "", "", nil, errors.Wrapf(err, "failed to lookup %s binary", mcBin)
-	}
-
-	deferF := &multiCloser{}
-	cl = deferF.F()
-
-	defer func() {
-		if err != nil {
-			deferF.F()()
-			cl = nil
-		}
-	}()
-
-	l, err := net.Listen("tcp", "localhost:0")
-	if err != nil {
-		return "", "", nil, err
-	}
-
-	addr := l.Addr().String()
-	if err = l.Close(); err != nil {
-		return "", "", nil, err
-	}
-	address = "http://" + addr
-
-	// start server
-	cmd := exec.Command(minioBin, "server", "--json", "--address", addr, t.TempDir())
-	cmd.Env = append(os.Environ(), []string{
-		"MINIO_ROOT_USER=" + opts.AccessKeyID,
-		"MINIO_ROOT_PASSWORD=" + opts.SecretAccessKey,
-	}...)
-	minioStop, err := startCmd(cmd, sb.Logs())
-	if err != nil {
-		return "", "", nil, err
-	}
-	if err = waitMinio(address, 15*time.Second); err != nil {
-		minioStop()
-		return "", "", nil, errors.Wrapf(err, "minio did not start up: %s", formatLogs(sb.Logs()))
-	}
-	deferF.append(minioStop)
-
-	// create alias config
-	alias := randomString(10)
-	cmd = exec.Command(mcBin, "alias", "set", alias, address, opts.AccessKeyID, opts.SecretAccessKey)
-	if err := runCmd(cmd, sb.Logs()); err != nil {
-		return "", "", nil, err
-	}
-	deferF.append(func() error {
-		return exec.Command(mcBin, "alias", "rm", alias).Run()
-	})
-
-	// create bucket
-	cmd = exec.Command(mcBin, "mb", "--region", opts.Region, fmt.Sprintf("%s/%s", alias, bucket)) // #nosec G204
-	if err := runCmd(cmd, sb.Logs()); err != nil {
-		return "", "", nil, err
-	}
-
-	// trace
-	cmd = exec.Command(mcBin, "admin", "trace", "--json", alias)
-	traceStop, err := startCmd(cmd, sb.Logs())
-	if err != nil {
-		return "", "", nil, err
-	}
-	deferF.append(traceStop)
-
-	return
-}
-
-func waitMinio(address string, d time.Duration) error {
-	step := 1 * time.Second
-	i := 0
-	for {
-		if resp, err := http.Get(fmt.Sprintf("%s/minio/health/live", address)); err == nil {
-			resp.Body.Close()
-			break
-		}
-		i++
-		if time.Duration(i)*step > d {
-			return errors.Errorf("failed dialing: %s", address)
-		}
-		time.Sleep(step)
-	}
-	return nil
-}

vendor/github.com/moby/buildkit/util/testutil/integration/pins.go

@@ -1,15 +1,16 @@
 package integration
 
 var pins = map[string]map[string]string{
-	// busybox is pinned to 1.35. Newer produces has "illegal instruction" panic on some of Github infra on sha256sum
+	// busybox 1.36
 	"busybox:latest": {
-		"amd64":   "sha256:0d5a701f0ca53f38723108687add000e1922f812d4187dea7feaee85d2f5a6c5",
+		"amd64":   "sha256:023917ec6a886d0e8e15f28fb543515a5fcd8d938edb091e8147db4efed388ee",
-		"arm64v8": "sha256:ffe38d75e44d8ffac4cd6d09777ffc31e94ea0ded6a0164e825a325dc17a3b68",
+		"arm64v8": "sha256:1fa89c01cd0473cedbd1a470abb8c139eeb80920edf1bc55de87851bfb63ea11",
-		"library": "sha256:f4ed5f2163110c26d42741fdc92bd1710e118aed4edb19212548e8ca4e5fca22",
+		"library": "sha256:3fbc632167424a6d997e74f52b878d7cc478225cffac6bc977eedfe51c7f4e79",
 	},
+	// alpine 3.18
 	"alpine:latest": {
-		"amd64":   "sha256:c0d488a800e4127c334ad20d61d7bc21b4097540327217dfab52262adc02380c",
+		"amd64":   "sha256:25fad2a32ad1f6f510e528448ae1ec69a28ef81916a004d3629874104f8a7f70",
-		"arm64v8": "sha256:af06af3514c44a964d3b905b498cf6493db8f1cde7c10e078213a89c87308ba0",
+		"arm64v8": "sha256:e3bd82196e98898cae9fe7fbfd6e2436530485974dc4fb3b7ddb69134eda2407",
-		"library": "sha256:8914eb54f968791faf6a8638949e480fef81e697984fba772b3976835194c6d4",
+		"library": "sha256:82d1e9d7ed48a7523bdebc18cf6290bdb97b82302a8a9c27d4fe885949ea94d1",
 	},
 }

vendor/github.com/moby/buildkit/util/testutil/integration/registry.go

@@ -15,11 +15,11 @@ import (
 )
 
 func NewRegistry(dir string) (url string, cl func() error, err error) {
-	if err := lookupBinary("registry"); err != nil {
+	if err := LookupBinary("registry"); err != nil {
 		return "", nil, err
 	}
 
-	deferF := &multiCloser{}
+	deferF := &MultiCloser{}
 	cl = deferF.F()
 
 	defer func() {
@@ -34,7 +34,7 @@ func NewRegistry(dir string) (url string, cl func() error, err error) {
 		if err != nil {
 			return "", nil, err
 		}
-		deferF.append(func() error { return os.RemoveAll(tmpdir) })
+		deferF.Append(func() error { return os.RemoveAll(tmpdir) })
 		dir = tmpdir
 	}
 
@@ -61,11 +61,11 @@ http:
 	if err != nil {
 		return "", nil, err
 	}
-	stop, err := startCmd(cmd, nil)
+	stop, err := StartCmd(cmd, nil)
 	if err != nil {
 		return "", nil, err
 	}
-	deferF.append(stop)
+	deferF.Append(stop)
 
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()

vendor/github.com/moby/buildkit/util/testutil/integration/run.go

@@ -21,7 +21,6 @@ import (
 	"github.com/moby/buildkit/util/appcontext"
 	"github.com/moby/buildkit/util/contentutil"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/semaphore"
 )
@@ -37,8 +36,10 @@ type Backend interface {
 	Address() string
 	DockerAddress() string
 	ContainerdAddress() string
+
 	Rootless() bool
 	Snapshotter() string
+	Supports(feature string) bool
 }
 
 type Sandbox interface {
@@ -422,44 +423,3 @@ func prepareValueMatrix(tc testConf) []matrixValue {
 	}
 	return m
 }
-
-func runStargzSnapshotter(cfg *BackendConfig) (address string, cl func() error, err error) {
-	binary := "containerd-stargz-grpc"
-	if err := lookupBinary(binary); err != nil {
-		return "", nil, err
-	}
-
-	deferF := &multiCloser{}
-	cl = deferF.F()
-
-	defer func() {
-		if err != nil {
-			deferF.F()()
-			cl = nil
-		}
-	}()
-
-	tmpStargzDir, err := os.MkdirTemp("", "bktest_containerd_stargz_grpc")
-	if err != nil {
-		return "", nil, err
-	}
-	deferF.append(func() error { return os.RemoveAll(tmpStargzDir) })
-
-	address = filepath.Join(tmpStargzDir, "containerd-stargz-grpc.sock")
-	stargzRootDir := filepath.Join(tmpStargzDir, "root")
-	cmd := exec.Command(binary,
-		"--log-level", "debug",
-		"--address", address,
-		"--root", stargzRootDir)
-	snStop, err := startCmd(cmd, cfg.Logs)
-	if err != nil {
-		return "", nil, err
-	}
-	if err = waitUnix(address, 10*time.Second, cmd); err != nil {
-		snStop()
-		return "", nil, errors.Wrapf(err, "containerd-stargz-grpc did not start up: %s", formatLogs(cfg.Logs))
-	}
-	deferF.append(snStop)
-
-	return
-}

vendor/github.com/moby/buildkit/util/testutil/integration/sandbox.go

@@ -8,76 +8,20 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/google/shlex"
 	"github.com/moby/buildkit/util/bklog"
-	"github.com/pkg/errors"
 )
 
 const buildkitdConfigFile = "buildkitd.toml"
 
-type backend struct {
-	address             string
-	dockerAddress       string
-	containerdAddress   string
-	rootless            bool
-	snapshotter         string
-	unsupportedFeatures []string
-	isDockerd           bool
-}
-
-func (b backend) Address() string {
-	return b.address
-}
-
-func (b backend) DockerAddress() string {
-	return b.dockerAddress
-}
-
-func (b backend) ContainerdAddress() string {
-	return b.containerdAddress
-}
-
-func (b backend) Rootless() bool {
-	return b.rootless
-}
-
-func (b backend) Snapshotter() string {
-	return b.snapshotter
-}
-
-func (b backend) isUnsupportedFeature(feature string) bool {
-	if enabledFeatures := os.Getenv("BUILDKIT_TEST_ENABLE_FEATURES"); enabledFeatures != "" {
-		for _, enabledFeature := range strings.Split(enabledFeatures, ",") {
-			if feature == enabledFeature {
-				return false
-			}
-		}
-	}
-	if disabledFeatures := os.Getenv("BUILDKIT_TEST_DISABLE_FEATURES"); disabledFeatures != "" {
-		for _, disabledFeature := range strings.Split(disabledFeatures, ",") {
-			if feature == disabledFeature {
-				return true
-			}
-		}
-	}
-	for _, unsupportedFeature := range b.unsupportedFeatures {
-		if feature == unsupportedFeature {
-			return true
-		}
-	}
-	return false
-}
-
 type sandbox struct {
 	Backend
 
 	logs    map[string]*bytes.Buffer
-	cleanup *multiCloser
+	cleanup *MultiCloser
 	mv      matrixValue
 	ctx     context.Context
 	name    string
@@ -96,7 +40,7 @@ func (sb *sandbox) Logs() map[string]*bytes.Buffer {
 }
 
 func (sb *sandbox) PrintLogs(t *testing.T) {
-	printLogs(sb.logs, t.Log)
+	PrintLogs(sb.logs, t.Log)
 }
 
 func (sb *sandbox) ClearLogs() {
@@ -108,7 +52,7 @@ func (sb *sandbox) NewRegistry() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	sb.cleanup.append(cl)
+	sb.cleanup.Append(cl)
 	return url, nil
 }
 
@@ -144,7 +88,7 @@ func newSandbox(ctx context.Context, w Worker, mirror string, mv matrixValue) (s
 		upt = append(upt, withMirrorConfig(mirror))
 	}
 
-	deferF := &multiCloser{}
+	deferF := &MultiCloser{}
 	cl = deferF.F()
 
 	defer func() {
@@ -159,7 +103,7 @@ func newSandbox(ctx context.Context, w Worker, mirror string, mv matrixValue) (s
 		if err != nil {
 			return nil, nil, err
 		}
-		deferF.append(func() error {
+		deferF.Append(func() error {
 			return os.RemoveAll(dir)
 		})
 		cfg.ConfigFile = filepath.Join(dir, buildkitdConfigFile)
@@ -169,7 +113,7 @@ func newSandbox(ctx context.Context, w Worker, mirror string, mv matrixValue) (s
 	if err != nil {
 		return nil, nil, err
 	}
-	deferF.append(closer)
+	deferF.Append(closer)
 
 	return &sandbox{
 		Backend: b,
@@ -181,95 +125,8 @@ func newSandbox(ctx context.Context, w Worker, mirror string, mv matrixValue) (s
 	}, cl, nil
 }
 
-func getBuildkitdAddr(tmpdir string) string {
+func RootlessSupported(uid int) bool {
-	address := "unix://" + filepath.Join(tmpdir, "buildkitd.sock")
+	cmd := exec.Command("sudo", "-E", "-u", fmt.Sprintf("#%d", uid), "-i", "--", "exec", "unshare", "-U", "true") //nolint:gosec // test utility
-	if runtime.GOOS == "windows" {
-		address = "//./pipe/buildkitd-" + filepath.Base(tmpdir)
-	}
-	return address
-}
-
-func runBuildkitd(ctx context.Context, conf *BackendConfig, args []string, logs map[string]*bytes.Buffer, uid, gid int, extraEnv []string) (address string, cl func() error, err error) {
-	deferF := &multiCloser{}
-	cl = deferF.F()
-
-	defer func() {
-		if err != nil {
-			deferF.F()()
-			cl = nil
-		}
-	}()
-
-	if conf.ConfigFile != "" {
-		args = append(args, "--config="+conf.ConfigFile)
-	}
-
-	tmpdir, err := os.MkdirTemp("", "bktest_buildkitd")
-	if err != nil {
-		return "", nil, err
-	}
-	if err := os.Chown(tmpdir, uid, gid); err != nil {
-		return "", nil, err
-	}
-	if err := os.MkdirAll(filepath.Join(tmpdir, "tmp"), 0711); err != nil {
-		return "", nil, err
-	}
-	if err := os.Chown(filepath.Join(tmpdir, "tmp"), uid, gid); err != nil {
-		return "", nil, err
-	}
-
-	deferF.append(func() error { return os.RemoveAll(tmpdir) })
-
-	address = getBuildkitdAddr(tmpdir)
-
-	args = append(args, "--root", tmpdir, "--addr", address, "--debug")
-	cmd := exec.Command(args[0], args[1:]...) //nolint:gosec // test utility
-	cmd.Env = append(os.Environ(), "BUILDKIT_DEBUG_EXEC_OUTPUT=1", "BUILDKIT_DEBUG_PANIC_ON_ERROR=1", "TMPDIR="+filepath.Join(tmpdir, "tmp"))
-	cmd.Env = append(cmd.Env, extraEnv...)
-	cmd.SysProcAttr = getSysProcAttr()
-
-	stop, err := startCmd(cmd, logs)
-	if err != nil {
-		return "", nil, err
-	}
-	deferF.append(stop)
-
-	if err := waitUnix(address, 15*time.Second, cmd); err != nil {
-		return "", nil, err
-	}
-
-	deferF.append(func() error {
-		f, err := os.Open("/proc/self/mountinfo")
-		if err != nil {
-			return errors.Wrap(err, "failed to open mountinfo")
-		}
-		defer f.Close()
-		s := bufio.NewScanner(f)
-		for s.Scan() {
-			if strings.Contains(s.Text(), tmpdir) {
-				return errors.Errorf("leaked mountpoint for %s", tmpdir)
-			}
-		}
-		return s.Err()
-	})
-
-	return address, cl, err
-}
-
-func getBackend(sb Sandbox) (*backend, error) {
-	sbx, ok := sb.(*sandbox)
-	if !ok {
-		return nil, errors.Errorf("invalid sandbox type %T", sb)
-	}
-	b, ok := sbx.Backend.(backend)
-	if !ok {
-		return nil, errors.Errorf("invalid backend type %T", b)
-	}
-	return &b, nil
-}
-
-func rootlessSupported(uid int) bool {
-	cmd := exec.Command("sudo", "-u", fmt.Sprintf("#%d", uid), "-i", "--", "exec", "unshare", "-U", "true") //nolint:gosec // test utility
 	b, err := cmd.CombinedOutput()
 	if err != nil {
 		bklog.L.Warnf("rootless mode is not supported on this host: %v (%s)", err, string(b))
@@ -278,7 +135,7 @@ func rootlessSupported(uid int) bool {
 	return true
 }
 
-func printLogs(logs map[string]*bytes.Buffer, f func(args ...interface{})) {
+func PrintLogs(logs map[string]*bytes.Buffer, f func(args ...interface{})) {
 	for name, l := range logs {
 		f(name)
 		s := bufio.NewScanner(l)
@@ -288,74 +145,25 @@ func printLogs(logs map[string]*bytes.Buffer, f func(args ...interface{})) {
 	}
 }
 
-const (
+func FormatLogs(m map[string]*bytes.Buffer) string {
-	FeatureCacheExport          = "cache_export"
+	var ss []string
-	FeatureCacheImport          = "cache_import"
+	for k, b := range m {
-	FeatureCacheBackendAzblob   = "cache_backend_azblob"
+		if b != nil {
-	FeatureCacheBackendGha      = "cache_backend_gha"
+			ss = append(ss, fmt.Sprintf("%q:%q", k, b.String()))
-	FeatureCacheBackendInline   = "cache_backend_inline"
+		}
-	FeatureCacheBackendLocal    = "cache_backend_local"
+	}
-	FeatureCacheBackendRegistry = "cache_backend_registry"
+	return strings.Join(ss, ",")
-	FeatureCacheBackendS3       = "cache_backend_s3"
-	FeatureDirectPush           = "direct_push"
-	FeatureFrontendOutline      = "frontend_outline"
-	FeatureFrontendTargets      = "frontend_targets"
-	FeatureImageExporter        = "image_exporter"
-	FeatureInfo                 = "info"
-	FeatureMergeDiff            = "merge_diff"
-	FeatureMultiCacheExport     = "multi_cache_export"
-	FeatureMultiPlatform        = "multi_platform"
-	FeatureOCIExporter          = "oci_exporter"
-	FeatureOCILayout            = "oci_layout"
-	FeatureProvenance           = "provenance"
-	FeatureSBOM                 = "sbom"
-	FeatureSecurityMode         = "security_mode"
-	FeatureSourceDateEpoch      = "source_date_epoch"
-	FeatureCNINetwork           = "cni_network"
-)
-
-var features = map[string]struct{}{
-	FeatureCacheExport:          {},
-	FeatureCacheImport:          {},
-	FeatureCacheBackendAzblob:   {},
-	FeatureCacheBackendGha:      {},
-	FeatureCacheBackendInline:   {},
-	FeatureCacheBackendLocal:    {},
-	FeatureCacheBackendRegistry: {},
-	FeatureCacheBackendS3:       {},
-	FeatureDirectPush:           {},
-	FeatureFrontendOutline:      {},
-	FeatureFrontendTargets:      {},
-	FeatureImageExporter:        {},
-	FeatureInfo:                 {},
-	FeatureMergeDiff:            {},
-	FeatureMultiCacheExport:     {},
-	FeatureMultiPlatform:        {},
-	FeatureOCIExporter:          {},
-	FeatureOCILayout:            {},
-	FeatureProvenance:           {},
-	FeatureSBOM:                 {},
-	FeatureSecurityMode:         {},
-	FeatureSourceDateEpoch:      {},
-	FeatureCNINetwork:           {},
 }
 
-func CheckFeatureCompat(t *testing.T, sb Sandbox, reason ...string) {
+func CheckFeatureCompat(t *testing.T, sb Sandbox, features map[string]struct{}, reason ...string) {
 	t.Helper()
 	if len(reason) == 0 {
 		t.Fatal("no reason provided")
 	}
-	b, err := getBackend(sb)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(b.unsupportedFeatures) == 0 {
-		return
-	}
 	var ereasons []string
 	for _, r := range reason {
 		if _, ok := features[r]; ok {
-			if b.isUnsupportedFeature(r) {
+			if !sb.Supports(r) {
 				ereasons = append(ereasons, r)
 			}
 		} else {

vendor/github.com/moby/buildkit/util/testutil/integration/sandbox_unix.go

@@ -1,12 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package integration
-
-import "syscall"
-
-func getSysProcAttr() *syscall.SysProcAttr {
-	return &syscall.SysProcAttr{
-		Setsid: true, // stretch sudo needs this for sigterm
-	}
-}

vendor/github.com/moby/buildkit/util/testutil/integration/sandbox_windows.go

@@ -1,10 +0,0 @@
-//go:build windows
-// +build windows
-
-package integration
-
-import "syscall"
-
-func getSysProcAttr() *syscall.SysProcAttr {
-	return &syscall.SysProcAttr{}
-}

vendor/github.com/moby/buildkit/util/testutil/integration/util.go

@@ -3,7 +3,6 @@ package integration
 import (
 	"bytes"
 	"context"
-	"crypto/rand"
 	"fmt"
 	"io"
 	"net"
@@ -21,20 +20,42 @@ import (
 	"golang.org/x/sync/errgroup"
 )
 
-func runCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) error {
+var ErrRequirements = errors.Errorf("missing requirements")
+
+func Tmpdir(t *testing.T, appliers ...fstest.Applier) string {
+	t.Helper()
+
+	// We cannot use t.TempDir() to create a temporary directory here because
+	// appliers might contain fstest.CreateSocket. If the test name is too long,
+	// t.TempDir() could return a path that is longer than 108 characters. This
+	// would result in "bind: invalid argument" when we listen on the socket.
+	tmpdir, err := os.MkdirTemp("", "buildkit")
+	require.NoError(t, err)
+
+	t.Cleanup(func() {
+		require.NoError(t, os.RemoveAll(tmpdir))
+	})
+
+	err = fstest.Apply(appliers...).Apply(tmpdir)
+	require.NoError(t, err)
+
+	return tmpdir
+}
+
+func RunCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) error {
 	if logs != nil {
 		setCmdLogs(cmd, logs)
 	}
-	fmt.Fprintf(cmd.Stderr, "> runCmd %v %+v\n", time.Now(), cmd.String())
+	fmt.Fprintf(cmd.Stderr, "> RunCmd %v %+v\n", time.Now(), cmd.String())
 	return cmd.Run()
 }
 
-func startCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) (func() error, error) {
+func StartCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) (func() error, error) {
 	if logs != nil {
 		setCmdLogs(cmd, logs)
 	}
 
-	fmt.Fprintf(cmd.Stderr, "> startCmd %v %+v\n", time.Now(), cmd.String())
+	fmt.Fprintf(cmd.Stderr, "> StartCmd %v %+v\n", time.Now(), cmd.String())
 
 	if err := cmd.Start(); err != nil {
 		return nil, err
@@ -79,16 +100,7 @@ func startCmd(cmd *exec.Cmd, logs map[string]*bytes.Buffer) (func() error, error
 	}, nil
 }
 
-func setCmdLogs(cmd *exec.Cmd, logs map[string]*bytes.Buffer) {
+func WaitUnix(address string, d time.Duration, cmd *exec.Cmd) error {
-	b := new(bytes.Buffer)
-	logs["stdout: "+cmd.String()] = b
-	cmd.Stdout = &lockingWriter{Writer: b}
-	b = new(bytes.Buffer)
-	logs["stderr: "+cmd.String()] = b
-	cmd.Stderr = &lockingWriter{Writer: b}
-}
-
-func waitUnix(address string, d time.Duration, cmd *exec.Cmd) error {
 	address = strings.TrimPrefix(address, "unix://")
 	addr, err := net.ResolveUnixAddr("unix", address)
 	if err != nil {
@@ -115,11 +127,19 @@ func waitUnix(address string, d time.Duration, cmd *exec.Cmd) error {
 	return nil
 }
 
-type multiCloser struct {
+func LookupBinary(name string) error {
+	_, err := exec.LookPath(name)
+	if err != nil {
+		return errors.Wrapf(ErrRequirements, "failed to lookup %s binary", name)
+	}
+	return nil
+}
+
+type MultiCloser struct {
 	fns []func() error
 }
 
-func (mc *multiCloser) F() func() error {
+func (mc *MultiCloser) F() func() error {
 	return func() error {
 		var err error
 		for i := range mc.fns {
@@ -132,25 +152,17 @@ func (mc *multiCloser) F() func() error {
 	}
 }
 
-func (mc *multiCloser) append(f func() error) {
+func (mc *MultiCloser) Append(f func() error) {
 	mc.fns = append(mc.fns, f)
 }
 
-var ErrRequirements = errors.Errorf("missing requirements")
+func setCmdLogs(cmd *exec.Cmd, logs map[string]*bytes.Buffer) {
-
+	b := new(bytes.Buffer)
-func lookupBinary(name string) error {
+	logs["stdout: "+cmd.String()] = b
-	_, err := exec.LookPath(name)
+	cmd.Stdout = &lockingWriter{Writer: b}
-	if err != nil {
+	b = new(bytes.Buffer)
-		return errors.Wrapf(ErrRequirements, "failed to lookup %s binary", name)
+	logs["stderr: "+cmd.String()] = b
-	}
+	cmd.Stderr = &lockingWriter{Writer: b}
-	return nil
-}
-
-func requireRoot() error {
-	if os.Getuid() != 0 {
-		return errors.Wrap(ErrRequirements, "requires root")
-	}
-	return nil
 }
 
 type lockingWriter struct {
@@ -164,33 +176,3 @@ func (w *lockingWriter) Write(dt []byte) (int, error) {
 	w.mu.Unlock()
 	return n, err
 }
-
-func Tmpdir(t *testing.T, appliers ...fstest.Applier) (string, error) {
-	// We cannot use t.TempDir() to create a temporary directory here because
-	// appliers might contain fstest.CreateSocket. If the test name is too long,
-	// t.TempDir() could return a path that is longer than 108 characters. This
-	// would result in "bind: invalid argument" when we listen on the socket.
-	tmpdir, err := os.MkdirTemp("", "buildkit")
-	if err != nil {
-		return "", err
-	}
-
-	t.Cleanup(func() {
-		require.NoError(t, os.RemoveAll(tmpdir))
-	})
-
-	if err := fstest.Apply(appliers...).Apply(tmpdir); err != nil {
-		return "", err
-	}
-	return tmpdir, nil
-}
-
-func randomString(n int) string {
-	chars := "abcdefghijklmnopqrstuvwxyz"
-	var b = make([]byte, n)
-	_, _ = rand.Read(b)
-	for k, v := range b {
-		b[k] = chars[v%byte(len(chars))]
-	}
-	return string(b)
-}

vendor/github.com/moby/buildkit/util/testutil/workers/backend.go

@@ -0,0 +1,59 @@
+package workers
+
+import (
+	"os"
+	"strings"
+)
+
+type backend struct {
+	address             string
+	dockerAddress       string
+	containerdAddress   string
+	rootless            bool
+	snapshotter         string
+	unsupportedFeatures []string
+	isDockerd           bool
+}
+
+func (b backend) Address() string {
+	return b.address
+}
+
+func (b backend) DockerAddress() string {
+	return b.dockerAddress
+}
+
+func (b backend) ContainerdAddress() string {
+	return b.containerdAddress
+}
+
+func (b backend) Rootless() bool {
+	return b.rootless
+}
+
+func (b backend) Snapshotter() string {
+	return b.snapshotter
+}
+
+func (b backend) Supports(feature string) bool {
+	if enabledFeatures := os.Getenv("BUILDKIT_TEST_ENABLE_FEATURES"); enabledFeatures != "" {
+		for _, enabledFeature := range strings.Split(enabledFeatures, ",") {
+			if feature == enabledFeature {
+				return true
+			}
+		}
+	}
+	if disabledFeatures := os.Getenv("BUILDKIT_TEST_DISABLE_FEATURES"); disabledFeatures != "" {
+		for _, disabledFeature := range strings.Split(disabledFeatures, ",") {
+			if feature == disabledFeature {
+				return false
+			}
+		}
+	}
+	for _, unsupportedFeature := range b.unsupportedFeatures {
+		if feature == unsupportedFeature {
+			return false
+		}
+	}
+	return true
+}

vendor/github.com/moby/buildkit/util/testutil/workers/containerd.go

@@ -1,7 +1,6 @@
-package integration
+package workers
 
 import (
-	"bytes"
 	"context"
 	"fmt"
 	"log"
@@ -14,11 +13,12 @@ import (
 	"time"
 
 	"github.com/moby/buildkit/util/bklog"
+	"github.com/moby/buildkit/util/testutil/integration"
 	"github.com/pkg/errors"
 )
 
 func InitContainerdWorker() {
-	Register(&Containerd{
+	integration.Register(&Containerd{
 		ID:         "containerd",
 		Containerd: "containerd",
 	})
@@ -32,7 +32,7 @@ func InitContainerdWorker() {
 				panic(errors.Errorf("unexpected BUILDKIT_INTEGRATION_CONTAINERD_EXTRA: %q", s))
 			}
 			name, bin := pair[0], pair[1]
-			Register(&Containerd{
+			integration.Register(&Containerd{
 				ID:         name,
 				Containerd: filepath.Join(bin, "containerd"),
 				// override PATH to make sure that the expected version of the shim binary is used
@@ -47,8 +47,8 @@ func InitContainerdWorker() {
 		if _, err := fmt.Sscanf(s, "%d:%d", &uid, &gid); err != nil {
 			bklog.L.Fatalf("unexpected BUILDKIT_INTEGRATION_ROOTLESS_IDPAIR: %q", s)
 		}
-		if rootlessSupported(uid) {
+		if integration.RootlessSupported(uid) {
-			Register(&Containerd{
+			integration.Register(&Containerd{
 				ID:          "containerd-rootless",
 				Containerd:  "containerd",
 				UID:         uid,
@@ -59,7 +59,7 @@ func InitContainerdWorker() {
 	}
 
 	if s := os.Getenv("BUILDKIT_INTEGRATION_SNAPSHOTTER"); s != "" {
-		Register(&Containerd{
+		integration.Register(&Containerd{
 			ID:          fmt.Sprintf("containerd-snapshotter-%s", s),
 			Containerd:  "containerd",
 			Snapshotter: s,
@@ -84,18 +84,18 @@ func (c *Containerd) Rootless() bool {
 	return c.UID != 0
 }
 
-func (c *Containerd) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func() error, err error) {
+func (c *Containerd) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) {
-	if err := lookupBinary(c.Containerd); err != nil {
+	if err := integration.LookupBinary(c.Containerd); err != nil {
 		return nil, nil, err
 	}
-	if err := lookupBinary("buildkitd"); err != nil {
+	if err := integration.LookupBinary("buildkitd"); err != nil {
 		return nil, nil, err
 	}
 	if err := requireRoot(); err != nil {
 		return nil, nil, err
 	}
 
-	deferF := &multiCloser{}
+	deferF := &integration.MultiCloser{}
 	cl = deferF.F()
 
 	defer func() {
@@ -123,7 +123,7 @@ func (c *Containerd) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl
 		}
 	}
 
-	deferF.append(func() error { return os.RemoveAll(tmpdir) })
+	deferF.Append(func() error { return os.RemoveAll(tmpdir) })
 
 	address := filepath.Join(tmpdir, "containerd.sock")
 	config := fmt.Sprintf(`root = %q
@@ -149,7 +149,7 @@ disabled_plugins = ["cri"]
 			if err != nil {
 				return nil, nil, err
 			}
-			deferF.append(snCl)
+			deferF.Append(snCl)
 			config = fmt.Sprintf(`%s
 
 [proxy_plugins]
@@ -168,7 +168,7 @@ disabled_plugins = ["cri"]
 	containerdArgs := []string{c.Containerd, "--config", configFile}
 	rootlessKitState := filepath.Join(tmpdir, "rootlesskit-containerd")
 	if rootless {
-		containerdArgs = append(append([]string{"sudo", "-u", fmt.Sprintf("#%d", c.UID), "-i",
+		containerdArgs = append(append([]string{"sudo", "-E", "-u", fmt.Sprintf("#%d", c.UID), "-i",
 			fmt.Sprintf("CONTAINERD_ROOTLESS_ROOTLESSKIT_STATE_DIR=%s", rootlessKitState),
 			// Integration test requires the access to localhost of the host network namespace.
 			// TODO: remove these configurations
@@ -181,15 +181,15 @@ disabled_plugins = ["cri"]
 	cmd := exec.Command(containerdArgs[0], containerdArgs[1:]...) //nolint:gosec // test utility
 	cmd.Env = append(os.Environ(), c.ExtraEnv...)
 
-	ctdStop, err := startCmd(cmd, cfg.Logs)
+	ctdStop, err := integration.StartCmd(cmd, cfg.Logs)
 	if err != nil {
 		return nil, nil, err
 	}
-	if err := waitUnix(address, 10*time.Second, cmd); err != nil {
+	if err := integration.WaitUnix(address, 10*time.Second, cmd); err != nil {
 		ctdStop()
-		return nil, nil, errors.Wrapf(err, "containerd did not start up: %s", formatLogs(cfg.Logs))
+		return nil, nil, errors.Wrapf(err, "containerd did not start up: %s", integration.FormatLogs(cfg.Logs))
 	}
-	deferF.append(ctdStop)
+	deferF.Append(ctdStop)
 
 	buildkitdArgs := append([]string{"buildkitd",
 		"--oci-worker=false",
@@ -211,16 +211,16 @@ disabled_plugins = ["cri"]
 		if err != nil {
 			return nil, nil, err
 		}
-		buildkitdArgs = append([]string{"sudo", "-u", fmt.Sprintf("#%d", c.UID), "-i", "--", "exec",
+		buildkitdArgs = append([]string{"sudo", "-E", "-u", fmt.Sprintf("#%d", c.UID), "-i", "--", "exec",
 			"nsenter", "-U", "--preserve-credentials", "-m", "-t", fmt.Sprintf("%d", pid)},
 			append(buildkitdArgs, "--containerd-worker-snapshotter=native")...)
 	}
 	buildkitdSock, stop, err := runBuildkitd(ctx, cfg, buildkitdArgs, cfg.Logs, c.UID, c.GID, c.ExtraEnv)
 	if err != nil {
-		printLogs(cfg.Logs, log.Println)
+		integration.PrintLogs(cfg.Logs, log.Println)
 		return nil, nil, err
 	}
-	deferF.append(stop)
+	deferF.Append(stop)
 
 	return backend{
 		address:           buildkitdSock,
@@ -234,12 +234,43 @@ func (c *Containerd) Close() error {
 	return nil
 }
 
-func formatLogs(m map[string]*bytes.Buffer) string {
+func runStargzSnapshotter(cfg *integration.BackendConfig) (address string, cl func() error, err error) {
-	var ss []string
+	binary := "containerd-stargz-grpc"
-	for k, b := range m {
+	if err := integration.LookupBinary(binary); err != nil {
-		if b != nil {
+		return "", nil, err
-			ss = append(ss, fmt.Sprintf("%q:%q", k, b.String()))
 	}
+
+	deferF := &integration.MultiCloser{}
+	cl = deferF.F()
+
+	defer func() {
+		if err != nil {
+			deferF.F()()
+			cl = nil
 		}
-	return strings.Join(ss, ",")
+	}()
+
+	tmpStargzDir, err := os.MkdirTemp("", "bktest_containerd_stargz_grpc")
+	if err != nil {
+		return "", nil, err
+	}
+	deferF.Append(func() error { return os.RemoveAll(tmpStargzDir) })
+
+	address = filepath.Join(tmpStargzDir, "containerd-stargz-grpc.sock")
+	stargzRootDir := filepath.Join(tmpStargzDir, "root")
+	cmd := exec.Command(binary,
+		"--log-level", "debug",
+		"--address", address,
+		"--root", stargzRootDir)
+	snStop, err := integration.StartCmd(cmd, cfg.Logs)
+	if err != nil {
+		return "", nil, err
+	}
+	if err = integration.WaitUnix(address, 10*time.Second, cmd); err != nil {
+		snStop()
+		return "", nil, errors.Wrapf(err, "containerd-stargz-grpc did not start up: %s", integration.FormatLogs(cfg.Logs))
+	}
+	deferF.Append(snStop)
+
+	return
 }

vendor/github.com/moby/buildkit/util/testutil/workers/dockerd.go

@@ -1,4 +1,4 @@
-package integration
+package workers
 
 import (
 	"context"
@@ -13,13 +13,14 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/moby/buildkit/cmd/buildkitd/config"
 	"github.com/moby/buildkit/util/testutil/dockerd"
+	"github.com/moby/buildkit/util/testutil/integration"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 )
 
 // InitDockerdWorker registers a dockerd worker with the global registry.
 func InitDockerdWorker() {
-	Register(&Moby{
+	integration.Register(&Moby{
 		ID:         "dockerd",
 		IsRootless: false,
 		Unsupported: []string{
@@ -42,7 +43,7 @@ func InitDockerdWorker() {
 			FeatureCNINetwork,
 		},
 	})
-	Register(&Moby{
+	integration.Register(&Moby{
 		ID:                    "dockerd-containerd",
 		IsRootless:            false,
 		ContainerdSnapshotter: true,
@@ -70,7 +71,7 @@ func (c Moby) Rootless() bool {
 	return c.IsRootless
 }
 
-func (c Moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func() error, err error) {
+func (c Moby) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) {
 	if err := requireRoot(); err != nil {
 		return nil, nil, err
 	}
@@ -106,7 +107,7 @@ func (c Moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func()
 		return nil, nil, errors.Wrapf(err, "failed to marshal dockerd config")
 	}
 
-	deferF := &multiCloser{}
+	deferF := &integration.MultiCloser{}
 	cl = deferF.F()
 
 	defer func() {
@@ -117,7 +118,7 @@ func (c Moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func()
 	}()
 
 	var proxyGroup errgroup.Group
-	deferF.append(proxyGroup.Wait)
+	deferF.Append(proxyGroup.Wait)
 
 	workDir, err := os.MkdirTemp("", "integration")
 	if err != nil {
@@ -126,7 +127,7 @@ func (c Moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func()
 
 	d, err := dockerd.NewDaemon(workDir)
 	if err != nil {
-		return nil, nil, errors.Errorf("new daemon error: %q, %s", err, formatLogs(cfg.Logs))
+		return nil, nil, errors.Errorf("new daemon error: %q, %s", err, integration.FormatLogs(cfg.Logs))
 	}
 
 	dockerdConfigFile := filepath.Join(workDir, "daemon.json")
@@ -148,21 +149,21 @@ func (c Moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func()
 	if err != nil {
 		return nil, nil, err
 	}
-	deferF.append(d.StopWithError)
+	deferF.Append(d.StopWithError)
 
-	if err := waitUnix(d.Sock(), 5*time.Second, nil); err != nil {
+	if err := integration.WaitUnix(d.Sock(), 5*time.Second, nil); err != nil {
-		return nil, nil, errors.Errorf("dockerd did not start up: %q, %s", err, formatLogs(cfg.Logs))
+		return nil, nil, errors.Errorf("dockerd did not start up: %q, %s", err, integration.FormatLogs(cfg.Logs))
 	}
 
 	dockerAPI, err := client.NewClientWithOpts(client.WithHost(d.Sock()))
 	if err != nil {
 		return nil, nil, err
 	}
-	deferF.append(dockerAPI.Close)
+	deferF.Append(dockerAPI.Close)
 
 	err = waitForAPI(ctx, dockerAPI, 5*time.Second)
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "dockerd client api timed out: %s", formatLogs(cfg.Logs))
+		return nil, nil, errors.Wrapf(err, "dockerd client api timed out: %s", integration.FormatLogs(cfg.Logs))
 	}
 
 	// Create a file descriptor to be used as a Unix domain socket.
@@ -178,9 +179,9 @@ func (c Moby) New(ctx context.Context, cfg *BackendConfig) (b Backend, cl func()
 
 	listener, err := net.Listen("unix", localPath)
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "dockerd listener error: %s", formatLogs(cfg.Logs))
+		return nil, nil, errors.Wrapf(err, "dockerd listener error: %s", integration.FormatLogs(cfg.Logs))
 	}
-	deferF.append(listener.Close)
+	deferF.Append(listener.Close)
 
 	proxyGroup.Go(func() error {
 		for {
@@ -244,10 +245,6 @@ func IsTestDockerd() bool {
 	return os.Getenv("TEST_DOCKERD") == "1"
 }
 
-func IsTestDockerdMoby(sb Sandbox) bool {
+func IsTestDockerdMoby(sb integration.Sandbox) bool {
-	b, err := getBackend(sb)
+	return sb.DockerAddress() != "" && sb.Name() == "dockerd"
-	if err != nil {
-		return false
-	}
-	return b.isDockerd && sb.Name() == "dockerd"
 }

vendor/github.com/moby/buildkit/util/testutil/workers/features.go

@@ -0,0 +1,63 @@
+package workers
+
+import (
+	"testing"
+
+	"github.com/moby/buildkit/util/testutil/integration"
+)
+
+const (
+	FeatureCacheExport          = "cache_export"
+	FeatureCacheImport          = "cache_import"
+	FeatureCacheBackendAzblob   = "cache_backend_azblob"
+	FeatureCacheBackendGha      = "cache_backend_gha"
+	FeatureCacheBackendInline   = "cache_backend_inline"
+	FeatureCacheBackendLocal    = "cache_backend_local"
+	FeatureCacheBackendRegistry = "cache_backend_registry"
+	FeatureCacheBackendS3       = "cache_backend_s3"
+	FeatureDirectPush           = "direct_push"
+	FeatureFrontendOutline      = "frontend_outline"
+	FeatureFrontendTargets      = "frontend_targets"
+	FeatureImageExporter        = "image_exporter"
+	FeatureInfo                 = "info"
+	FeatureMergeDiff            = "merge_diff"
+	FeatureMultiCacheExport     = "multi_cache_export"
+	FeatureMultiPlatform        = "multi_platform"
+	FeatureOCIExporter          = "oci_exporter"
+	FeatureOCILayout            = "oci_layout"
+	FeatureProvenance           = "provenance"
+	FeatureSBOM                 = "sbom"
+	FeatureSecurityMode         = "security_mode"
+	FeatureSourceDateEpoch      = "source_date_epoch"
+	FeatureCNINetwork           = "cni_network"
+)
+
+var features = map[string]struct{}{
+	FeatureCacheExport:          {},
+	FeatureCacheImport:          {},
+	FeatureCacheBackendAzblob:   {},
+	FeatureCacheBackendGha:      {},
+	FeatureCacheBackendInline:   {},
+	FeatureCacheBackendLocal:    {},
+	FeatureCacheBackendRegistry: {},
+	FeatureCacheBackendS3:       {},
+	FeatureDirectPush:           {},
+	FeatureFrontendOutline:      {},
+	FeatureFrontendTargets:      {},
+	FeatureImageExporter:        {},
+	FeatureInfo:                 {},
+	FeatureMergeDiff:            {},
+	FeatureMultiCacheExport:     {},
+	FeatureMultiPlatform:        {},
+	FeatureOCIExporter:          {},
+	FeatureOCILayout:            {},
+	FeatureProvenance:           {},
+	FeatureSBOM:                 {},
+	FeatureSecurityMode:         {},
+	FeatureSourceDateEpoch:      {},
+	FeatureCNINetwork:           {},
+}
+
+func CheckFeatureCompat(t *testing.T, sb integration.Sandbox, reason ...string) {
+	integration.CheckFeatureCompat(t, sb, features, reason...)
+}

vendor/github.com/moby/buildkit/util/testutil/workers/oci.go

@@ -1,4 +1,4 @@
-package integration
+package workers
 
 import (
 	"context"
@@ -8,11 +8,12 @@ import (
 	"runtime"
 
 	"github.com/moby/buildkit/util/bklog"
+	"github.com/moby/buildkit/util/testutil/integration"
 	"github.com/pkg/errors"
 )
 
 func InitOCIWorker() {
-	Register(&OCI{ID: "oci"})
+	integration.Register(&OCI{ID: "oci"})
 
 	// the rootless uid is defined in Dockerfile
 	if s := os.Getenv("BUILDKIT_INTEGRATION_ROOTLESS_IDPAIR"); s != "" {
@@ -20,13 +21,13 @@ func InitOCIWorker() {
 		if _, err := fmt.Sscanf(s, "%d:%d", &uid, &gid); err != nil {
 			bklog.L.Fatalf("unexpected BUILDKIT_INTEGRATION_ROOTLESS_IDPAIR: %q", s)
 		}
-		if rootlessSupported(uid) {
+		if integration.RootlessSupported(uid) {
-			Register(&OCI{ID: "oci-rootless", UID: uid, GID: gid})
+			integration.Register(&OCI{ID: "oci-rootless", UID: uid, GID: gid})
 		}
 	}
 
 	if s := os.Getenv("BUILDKIT_INTEGRATION_SNAPSHOTTER"); s != "" {
-		Register(&OCI{ID: "oci-snapshotter-" + s, Snapshotter: s})
+		integration.Register(&OCI{ID: "oci-snapshotter-" + s, Snapshotter: s})
 	}
 }
 
@@ -45,8 +46,8 @@ func (s *OCI) Rootless() bool {
 	return s.UID != 0
 }
 
-func (s *OCI) New(ctx context.Context, cfg *BackendConfig) (Backend, func() error, error) {
+func (s *OCI) New(ctx context.Context, cfg *integration.BackendConfig) (integration.Backend, func() error, error) {
-	if err := lookupBinary("buildkitd"); err != nil {
+	if err := integration.LookupBinary("buildkitd"); err != nil {
 		return nil, nil, err
 	}
 	if err := requireRoot(); err != nil {
@@ -65,7 +66,7 @@ func (s *OCI) New(ctx context.Context, cfg *BackendConfig) (Backend, func() erro
 			return nil, nil, errors.Errorf("unsupported id pair: uid=%d, gid=%d", s.UID, s.GID)
 		}
 		// TODO: make sure the user exists and subuid/subgid are configured.
-		buildkitdArgs = append([]string{"sudo", "-u", fmt.Sprintf("#%d", s.UID), "-i", "--", "exec", "rootlesskit"}, buildkitdArgs...)
+		buildkitdArgs = append([]string{"sudo", "-E", "-u", fmt.Sprintf("#%d", s.UID), "-i", "--", "exec", "rootlesskit"}, buildkitdArgs...)
 	}
 
 	var extraEnv []string
@@ -74,7 +75,7 @@ func (s *OCI) New(ctx context.Context, cfg *BackendConfig) (Backend, func() erro
 	}
 	buildkitdSock, stop, err := runBuildkitd(ctx, cfg, buildkitdArgs, cfg.Logs, s.UID, s.GID, extraEnv)
 	if err != nil {
-		printLogs(cfg.Logs, log.Println)
+		integration.PrintLogs(cfg.Logs, log.Println)
 		return nil, nil, err
 	}
 

vendor/github.com/moby/buildkit/util/testutil/workers/sysprocattr_unix.go

@@ -0,0 +1,23 @@
+//go:build !windows
+// +build !windows
+
+package workers
+
+import (
+	"path/filepath"
+	"syscall"
+)
+
+func getSysProcAttr() *syscall.SysProcAttr {
+	return &syscall.SysProcAttr{
+		Setsid: true, // stretch sudo needs this for sigterm
+	}
+}
+
+func getBuildkitdAddr(tmpdir string) string {
+	return "unix://" + filepath.Join(tmpdir, "buildkitd.sock")
+}
+
+func getTraceSocketPath(tmpdir string) string {
+	return filepath.Join(tmpdir, "otel-grpc.sock")
+}

vendor/github.com/moby/buildkit/util/testutil/workers/sysprocattr_windows.go

@@ -0,0 +1,21 @@
+//go:build windows
+// +build windows
+
+package workers
+
+import (
+	"path/filepath"
+	"syscall"
+)
+
+func getSysProcAttr() *syscall.SysProcAttr {
+	return &syscall.SysProcAttr{}
+}
+
+func getBuildkitdAddr(tmpdir string) string {
+	return "//./pipe/buildkitd-" + filepath.Base(tmpdir)
+}
+
+func getTraceSocketPath(tmpdir string) string {
+	return `\\.\pipe\buildkit-otel-grpc-` + filepath.Base(tmpdir)
+}

vendor/github.com/moby/buildkit/util/testutil/workers/util.go

@@ -0,0 +1,89 @@
+package workers
+
+import (
+	"bufio"
+	"bytes"
+	"context"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/moby/buildkit/util/testutil/integration"
+	"github.com/pkg/errors"
+)
+
+func requireRoot() error {
+	if os.Getuid() != 0 {
+		return errors.Wrap(integration.ErrRequirements, "requires root")
+	}
+	return nil
+}
+
+func runBuildkitd(ctx context.Context, conf *integration.BackendConfig, args []string, logs map[string]*bytes.Buffer, uid, gid int, extraEnv []string) (address string, cl func() error, err error) {
+	deferF := &integration.MultiCloser{}
+	cl = deferF.F()
+
+	defer func() {
+		if err != nil {
+			deferF.F()()
+			cl = nil
+		}
+	}()
+
+	if conf.ConfigFile != "" {
+		args = append(args, "--config="+conf.ConfigFile)
+	}
+
+	tmpdir, err := os.MkdirTemp("", "bktest_buildkitd")
+	if err != nil {
+		return "", nil, err
+	}
+	if err := os.Chown(tmpdir, uid, gid); err != nil {
+		return "", nil, err
+	}
+	if err := os.MkdirAll(filepath.Join(tmpdir, "tmp"), 0711); err != nil {
+		return "", nil, err
+	}
+	if err := os.Chown(filepath.Join(tmpdir, "tmp"), uid, gid); err != nil {
+		return "", nil, err
+	}
+
+	deferF.Append(func() error { return os.RemoveAll(tmpdir) })
+
+	address = getBuildkitdAddr(tmpdir)
+
+	args = append(args, "--root", tmpdir, "--addr", address, "--debug")
+	cmd := exec.Command(args[0], args[1:]...) //nolint:gosec // test utility
+	cmd.Env = append(os.Environ(), "BUILDKIT_DEBUG_EXEC_OUTPUT=1", "BUILDKIT_DEBUG_PANIC_ON_ERROR=1", "BUILDKIT_TRACE_SOCKET="+getTraceSocketPath(tmpdir), "TMPDIR="+filepath.Join(tmpdir, "tmp"))
+	cmd.Env = append(cmd.Env, extraEnv...)
+	cmd.SysProcAttr = getSysProcAttr()
+
+	stop, err := integration.StartCmd(cmd, logs)
+	if err != nil {
+		return "", nil, err
+	}
+	deferF.Append(stop)
+
+	if err := integration.WaitUnix(address, 15*time.Second, cmd); err != nil {
+		return "", nil, err
+	}
+
+	deferF.Append(func() error {
+		f, err := os.Open("/proc/self/mountinfo")
+		if err != nil {
+			return errors.Wrap(err, "failed to open mountinfo")
+		}
+		defer f.Close()
+		s := bufio.NewScanner(f)
+		for s.Scan() {
+			if strings.Contains(s.Text(), tmpdir) {
+				return errors.Errorf("leaked mountpoint for %s", tmpdir)
+			}
+		}
+		return s.Err()
+	})
+
+	return address, cl, err
+}

vendor/modules.txt

@@ -501,7 +501,7 @@ github.com/mitchellh/go-wordwrap
 # github.com/mitchellh/mapstructure v1.5.0
 ## explicit; go 1.14
 github.com/mitchellh/mapstructure
-# github.com/moby/buildkit v0.12.1-0.20230717122532-faa0cc7da353
+# github.com/moby/buildkit v0.12.1-0.20230804094609-b49a8873179b
 ## explicit; go 1.20
 github.com/moby/buildkit/api/services/control
 github.com/moby/buildkit/api/types
@@ -569,6 +569,7 @@ github.com/moby/buildkit/util/system
 github.com/moby/buildkit/util/testutil
 github.com/moby/buildkit/util/testutil/dockerd
 github.com/moby/buildkit/util/testutil/integration
+github.com/moby/buildkit/util/testutil/workers
 github.com/moby/buildkit/util/tracing
 github.com/moby/buildkit/util/tracing/detect
 github.com/moby/buildkit/util/tracing/detect/delegated