Merge pull request #48 from SarahB-hub/sbrady/add-buildkit-daemon-config-flag

Add support for optional --buildkitd-config flag to buildx builder function

Author: jamie-harness

app.go

@@ -315,6 +315,11 @@ func Run() {
 			Name:   "builder-name",
 			EnvVar: "PLUGIN_BUILDER_NAME",
 		},
+		cli.StringFlag{
+			Name:   "builder-daemon-config",
+			Usage:  "Path to config file for Buildkit daemon",
+			EnvVar: "PLUGIN_BUILDER_CONFIG",
+		},
 		cli.StringFlag{
 			Name:   "builder-driver",
 			EnvVar: "PLUGIN_BUILDER_DRIVER",
@@ -441,6 +446,7 @@ func run(c *cli.Context) error {
 		},
 		Builder: Builder{
 			Name:          c.String("builder-name"),
+			DaemonConfig:  c.String("builder-daemon-config"),
 			Driver:        c.String("builder-driver"),
 			DriverOpts:    c.Generic("builder-driver-opts").(*CustomStringSliceFlag).GetValue(),
 			DriverOptsNew: c.Generic("builder-driver-opts-new").(*CustomStringSliceFlag).GetValue(),

buildx.go

@@ -15,6 +15,9 @@ func cmdSetupBuildx(builder Builder, driverOpts []string) *exec.Cmd {
 	if builder.Name != "" {
 		args = append(args, "--name", builder.Name)
 	}
+	if builder.DaemonConfig != "" {
+		args = append(args, "--buildkitd-config", builder.DaemonConfig)
+	}
 	for _, opt := range driverOpts {
 		args = append(args, "--driver-opt", opt)
 	}

docker.go

@@ -35,6 +35,7 @@ type (
 
 	Builder struct {
 		Name          string   // Buildx builder name
+		DaemonConfig  string   // Buildx daemon config file path
 		Driver        string   // Buildx driver type
 		DriverOpts    []string // Buildx driver opts
 		DriverOptsNew []string // Buildx driver opts new