docker-container: mount driver-opt

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

Author: crazy-max

driver/docker-container/driver.go

@@ -57,6 +57,7 @@ type Driver struct {
 	env           []string
 	defaultLoad   bool
 	gpus          []container.DeviceRequest
+	mounts        map[string]string
 }
 
 func (d *Driver) IsMobyDriver() bool {
@@ -137,6 +138,15 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
 			},
 		}
 
+		for k, v := range d.mounts {
+			mounts = append(mounts, mount.Mount{
+				Type:     mount.TypeBind,
+				Source:   k,
+				Target:   v,
+				ReadOnly: true,
+			})
+		}
+
 		// Mount WSL libaries if running in WSL environment and Docker context
 		// is a local socket as requesting GPU on container builder creation
 		// is not enough when generating the CDI specification for GPU devices.

driver/docker-container/factory.go

@@ -111,6 +111,15 @@ func (f *factory) New(ctx context.Context, cfg driver.InitConfig) (driver.Driver
 				return nil, errors.Errorf("invalid env option %q, expecting env.FOO=bar", k)
 			}
 			d.env = append(d.env, fmt.Sprintf("%s=%s", envName, v))
+		case strings.HasPrefix(k, "mount."):
+			mountSrc := strings.TrimPrefix(k, "mount.")
+			if mountSrc == "" {
+				return nil, errors.Errorf("invalid mount option %q, expecting mount.<src>=<dest>", k)
+			}
+			if d.mounts == nil {
+				d.mounts = make(map[string]string)
+			}
+			d.mounts[mountSrc] = v
 		default:
 			return nil, errors.Errorf("invalid driver option %s for docker-container driver", k)
 		}

tests/create.go

@@ -3,6 +3,7 @@ package tests
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -23,6 +24,7 @@ var createTests = []func(t *testing.T, sb integration.Sandbox){
 	testCreateMemoryLimit,
 	testCreateRestartAlways,
 	testCreateRemoteContainer,
+	testCreateMount,
 }
 
 func testCreateMemoryLimit(t *testing.T, sb integration.Sandbox) {
@@ -108,3 +110,31 @@ func testCreateRemoteContainer(t *testing.T, sb integration.Sandbox) {
 	}
 	require.Fail(t, "remote builder is not running")
 }
+
+func testCreateMount(t *testing.T, sb integration.Sandbox) {
+	if !isDockerContainerWorker(sb) {
+		t.Skip("only testing with docker-container worker")
+	}
+
+	var builderName string
+	t.Cleanup(func() {
+		if builderName == "" {
+			return
+		}
+		out, err := rmCmd(sb, withArgs(builderName))
+		require.NoError(t, err, out)
+	})
+
+	d, err := filepath.Abs(t.TempDir())
+	require.NoError(t, err)
+
+	f := filepath.Join(d, "test.json")
+	require.NoError(t, os.WriteFile(f, []byte(`{"test":{"foo":"bar"}}`), 0644))
+
+	out, err := createCmd(sb, withArgs("--driver", "docker-container", "--driver-opt", fmt.Sprintf(`mount.%s=/etc/buildkit/provenance.d/test.json`, f)))
+	require.NoError(t, err, out)
+	builderName = strings.TrimSpace(out)
+
+	out, err = inspectCmd(sb, withArgs(builderName, "--bootstrap"))
+	require.NoError(t, err, out)
+}