Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamie-harness merged 2 commits into from
Nov 29, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0734af
Added support for optional --buildkitd-config flag to buildx builder …
SarahB-hub Nov 28, 2024
2ae2211
Merge branch 'master' into sbrady/add-buildkit-daemon-config-flag
SarahB-hub Nov 29, 2024
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
6 changes: 6 additions & 0 deletions app.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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