docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-15 07:57:07 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

driver: allow configuring buildkitd flags

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2019-07-08 15:06:07 -07:00
parent 550c2b9042
commit f0af89a204
8 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
driver/docker-container/driver.go
View File

@ -59,10 +59,16 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
}); err != nil {
return err
}
cfg := &container.Config{
Image: buildkitImage,
}
if d.InitConfig.BuildkitFlags != nil {
cfg.Cmd = d.InitConfig.BuildkitFlags
}
if err := l.Wrap("creating container "+d.Name, func() error {
_, err := d.DockerAPI.ContainerCreate(ctx, &container.Config{
Image: buildkitImage,
}, &container.HostConfig{
_, err := d.DockerAPI.ContainerCreate(ctx, cfg, &container.HostConfig{
Privileged: true,
}, &network.NetworkingConfig{}, d.Name)
if err != nil {

15
driver/manager.go
View File

@ -23,10 +23,10 @@ type BuildkitConfig struct {
type InitConfig struct {
// This object needs updates to be generic for different drivers
Name string
DockerAPI dockerclient.APIClient
BuildkitConfig BuildkitConfig
Meta map[string]interface{}
Name string
DockerAPI dockerclient.APIClient
BuildkitFlags []string
Meta map[string]interface{}
}
var drivers map[string]Factory
@ -71,10 +71,11 @@ func GetFactory(name string, instanceRequired bool) Factory {
return nil
}
func GetDriver(ctx context.Context, name string, f Factory, api dockerclient.APIClient) (Driver, error) {
func GetDriver(ctx context.Context, name string, f Factory, api dockerclient.APIClient, flags []string) (Driver, error) {
ic := InitConfig{
DockerAPI: api,
Name: name,
DockerAPI: api,
Name: name,
BuildkitFlags: flags,
}
if f == nil {
var err error