Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions driver/docker-container/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ type Driver struct {
env []string
defaultLoad bool
gpus []container.DeviceRequest
mounts map[string]string
}

func (d *Driver) IsMobyDriver() bool {
Expand Down Expand Up @@ -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.
Expand Down
9 changes: 9 additions & 0 deletions driver/docker-container/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
31 changes: 31 additions & 0 deletions tests/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ var createTests = []func(t *testing.T, sb integration.Sandbox){
testCreateMemoryLimit,
testCreateRestartAlways,
testCreateRemoteContainer,
testCreateMount,
}

func testCreateMemoryLimit(t *testing.T, sb integration.Sandbox) {
Expand Down Expand Up @@ -108,3 +109,33 @@ 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)
})

f, err := os.CreateTemp(os.TempDir(), "test-create-mount-*.json")
require.NoError(t, err)
defer os.Remove(f.Name())

_, err = f.Write([]byte(`{"test":{"foo":"bar"}}`))
f.Close()
require.NoError(t, err)

out, err := createCmd(sb, withArgs("--driver", "docker-container", "--driver-opt", fmt.Sprintf(`mount.%s=/etc/buildkit/provenance.d/test.json`, f.Name())))
require.NoError(t, err, out)
builderName = strings.TrimSpace(out)

out, err = inspectCmd(sb, withArgs(builderName, "--bootstrap"))
require.NoError(t, err, out)
}