Skip to content

Commit

Permalink
Merge pull request #48 from SarahB-hub/sbrady/add-buildkit-daemon-con…
Browse files Browse the repository at this point in the history
…fig-flag

Add support for optional --buildkitd-config flag to buildx builder function
  • Loading branch information
jamie-harness authored Nov 29, 2024
2 parents d713a71 + 2ae2211 commit a305e9e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
6 changes: 6 additions & 0 deletions app.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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(),
Expand Down
3 changes: 3 additions & 0 deletions buildx.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
1 change: 1 addition & 0 deletions docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a305e9e

Please sign in to comment.