dockerfile: device flag support

Signed-off-by: CrazyMax <[email protected]>

Author: crazy-max

frontend/dockerfile/dockerfile2llb/convert.go

@@ -1305,11 +1305,16 @@ func dispatchRun(d *dispatchState, c *instructions.RunCommand, proxy *llb.ProxyE
 		}
 	}
 
-	// TODO: use entitlements and put this on labs
+	// TODO: use entitlements
 	if dopt.llbCaps != nil && dopt.llbCaps.Supports(pb.CapExecMetaCDI) == nil {
 		for _, u := range dopt.devices {
 			opt = append(opt, llb.AddCDIDevice(u.Name))
 		}
+		runDevices, err := dispatchRunDevices(c)
+		if err != nil {
+			return err
+		}
+		opt = append(opt, runDevices...)
 	}
 
 	shlex := *dopt.shlex

frontend/dockerfile/dockerfile2llb/convert_rundevice.go

@@ -0,0 +1,17 @@
+package dockerfile2llb
+
+// TODO: move in labs with dfrundevice tag
+
+import (
+	"github.com/moby/buildkit/client/llb"
+	"github.com/moby/buildkit/frontend/dockerfile/instructions"
+)
+
+func dispatchRunDevices(c *instructions.RunCommand) ([]llb.RunOption, error) {
+	var out []llb.RunOption
+	devices := instructions.GetDevices(c)
+	for _, device := range devices {
+		out = append(out, llb.AddCDIDevice(device))
+	}
+	return out, nil
+}

frontend/dockerfile/dockerfile_rundevice_test.go

@@ -15,6 +15,7 @@ import (
 
 var deviceTests = integration.TestFuncs(
 	testDeviceEnv,
+	testDeviceRunEnv,
 )
 
 func testDeviceEnv(t *testing.T, sb integration.Sandbox) {
@@ -74,3 +75,58 @@ COPY --from=base /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()
+	}
+
+	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 --device=vendor1.com/device=foo 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{
+		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`)
+}

frontend/dockerfile/instructions/commands_rundevice.go

@@ -0,0 +1,49 @@
+package instructions
+
+import (
+	"github.com/pkg/errors"
+)
+
+var deviceKey = "dockerfile/run/device"
+
+func init() {
+	parseRunPreHooks = append(parseRunPreHooks, runDevicePreHook)
+	parseRunPostHooks = append(parseRunPostHooks, runDevicePostHook)
+}
+
+func runDevicePreHook(cmd *RunCommand, req parseRequest) error {
+	st := &deviceState{}
+	st.flag = req.flags.AddStrings("device")
+	cmd.setExternalValue(deviceKey, st)
+	return nil
+}
+
+func runDevicePostHook(cmd *RunCommand, req parseRequest) error {
+	return setDeviceState(cmd)
+}
+
+func setDeviceState(cmd *RunCommand) error {
+	st := getDeviceState(cmd)
+	if st == nil {
+		return errors.Errorf("no device state")
+	}
+	st.names = st.flag.StringValues
+	return nil
+}
+
+func getDeviceState(cmd *RunCommand) *deviceState {
+	v := cmd.getExternalValue(deviceKey)
+	if v == nil {
+		return nil
+	}
+	return v.(*deviceState)
+}
+
+func GetDevices(cmd *RunCommand) []string {
+	return getDeviceState(cmd).names
+}
+
+type deviceState struct {
+	flag  *Flag
+	names []string
+}