dockerfile: remove device frontend attr support

Signed-off-by: CrazyMax <[email protected]>
moby · Feb 11, 2025 · 88509a9 · 88509a9
1 parent a83a253
commit 88509a9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 86 deletions.
diff --git a/frontend/dockerfile/dockerfile_rundevice_test.go b/frontend/dockerfile/dockerfile_rundevice_test.go
@@ -17,70 +17,10 @@ import (
 
 func init() {
 	allTests = append(allTests, integration.TestFuncs(
-		testDeviceEnv,
 		testDeviceRunEnv,
 	)...)
 }
 
-func testDeviceEnv(t *testing.T, sb integration.Sandbox) {
-	if sb.Rootless() {
-		t.SkipNow()
-	}
-
-	integration.SkipOnPlatform(t, "windows")
-	f := getFrontend(t, sb)
-
-	require.NoError(t, os.WriteFile(filepath.Join(sb.CDISpecDir(), "vendor1-device.yaml"), []byte(`
-cdiVersion: "0.3.0"
-kind: "vendor1.com/device"
-devices:
-- name: foo
-  containerEdits:
-    env:
-    - FOO=injected
-`), 0600))
-
-	dockerfile := []byte(`
-FROM busybox AS base
-RUN env|sort | tee foo.env
-FROM scratch
-COPY --from=base /foo.env /
-`)
-
-	dir := integration.Tmpdir(
-		t,
-		fstest.CreateFile("Dockerfile", dockerfile, 0600),
-	)
-
-	c, err := client.New(sb.Context(), sb.Address())
-	require.NoError(t, err)
-	defer c.Close()
-
-	destDir := t.TempDir()
-
-	_, err = f.Solve(sb.Context(), c, client.SolveOpt{
-		FrontendAttrs: map[string]string{
-			"device:0": "vendor1.com/device=foo,required",
-			"device:1": "vendor2.com/device=bar",
-		},
-		LocalMounts: map[string]fsutil.FS{
-			dockerui.DefaultLocalNameDockerfile: dir,
-			dockerui.DefaultLocalNameContext:    dir,
-		},
-		Exports: []client.ExportEntry{
-			{
-				Type:      client.ExporterLocal,
-				OutputDir: destDir,
-			},
-		},
-	}, nil)
-	require.NoError(t, err)
-
-	dt, err := os.ReadFile(filepath.Join(destDir, "foo.env"))
-	require.NoError(t, err)
-	require.Contains(t, string(dt), `FOO=injected`)
-}
-
 func testDeviceRunEnv(t *testing.T, sb integration.Sandbox) {
 	if sb.Rootless() {
 		t.SkipNow()

diff --git a/frontend/dockerui/attr.go b/frontend/dockerui/attr.go
@@ -9,7 +9,6 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/docker/go-units"
 	"github.com/moby/buildkit/client/llb"
-	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/buildkit/solver/pb"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
@@ -98,24 +97,6 @@ func parseUlimits(v string) ([]*pb.Ulimit, error) {
 	return out, nil
 }
 
-func parseDevices(v map[string]string) ([]*pb.CDIDevice, error) {
-	if v == nil {
-		return nil, nil
-	}
-	out := make([]*pb.CDIDevice, 0)
-	for _, attrs := range v {
-		device, err := instructions.ParseDevice(attrs)
-		if err != nil {
-			return nil, err
-		}
-		out = append(out, &pb.CDIDevice{
-			Name:     device.Name,
-			Optional: !device.Required,
-		})
-	}
-	return out, nil
-}
-
 func parseNetMode(v string) (pb.NetMode, error) {
 	if v == "" {
 		return llb.NetModeSandbox, nil

diff --git a/frontend/dockerui/config.go b/frontend/dockerui/config.go
@@ -28,7 +28,6 @@ const (
 	buildArgPrefix       = "build-arg:"
 	labelPrefix          = "label:"
 	localSessionIDPrefix = "local-sessionid:"
-	devicePrefix         = "device:"
 
 	keyTarget           = "target"
 	keyCgroupParent     = "cgroup-parent"
@@ -189,12 +188,6 @@ func (bc *Client) init() error {
 	}
 	bc.Ulimits = ulimits
 
-	devices, err := parseDevices(filter(opts, devicePrefix))
-	if err != nil {
-		return errors.Wrap(err, "failed to parse devices")
-	}
-	bc.Devices = devices
-
 	defaultNetMode, err := parseNetMode(opts[keyForceNetwork])
 	if err != nil {
 		return err