docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-18 17:37:46 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

docker-container: allow setting custom buildkit image

Browse Source 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi 2019-07-31 18:19:03 -07:00
parent bcc882cbf1
commit afd821010d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,12 +22,13 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
var buildkitImage = "moby/buildkit:master" // TODO: make this verified and configuratble var defaultBuildkitImage = "moby/buildkit:buildx-stable-1" // TODO: make this verified
type Driver struct { type Driver struct {
driver.InitConfig driver.InitConfig
factory driver.Factory factory driver.Factory
netMode string netMode string
image string
} }
func (d *Driver) Bootstrap(ctx context.Context, l progress.Logger) error { func (d *Driver) Bootstrap(ctx context.Context, l progress.Logger) error {
@ -52,8 +53,12 @@ func (d *Driver) Bootstrap(ctx context.Context, l progress.Logger) error {
} }
func (d *Driver) create(ctx context.Context, l progress.SubLogger) error { func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
if err := l.Wrap("pulling image "+buildkitImage, func() error { imageName := defaultBuildkitImage
rc, err := d.DockerAPI.ImageCreate(ctx, buildkitImage, types.ImageCreateOptions{}) if d.image != "" {
imageName = d.image
}
if err := l.Wrap("pulling image "+imageName, func() error {
rc, err := d.DockerAPI.ImageCreate(ctx, imageName, types.ImageCreateOptions{})
if err != nil { if err != nil {
return err return err
} }
@ -64,7 +69,7 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
} }
cfg := &container.Config{ cfg := &container.Config{
Image: buildkitImage, Image: imageName,
} }
if d.InitConfig.BuildkitFlags != nil { if d.InitConfig.BuildkitFlags != nil {
cfg.Cmd = d.InitConfig.BuildkitFlags cfg.Cmd = d.InitConfig.BuildkitFlags

4
driver/docker-container/factory.go
View File

@ -45,8 +45,10 @@ func (f *factory) New(ctx context.Context, cfg driver.InitConfig) (driver.Driver
if v == "host" { if v == "host" {
d.InitConfig.BuildkitFlags = append(d.InitConfig.BuildkitFlags, "--allow-insecure-entitlement=network.host") d.InitConfig.BuildkitFlags = append(d.InitConfig.BuildkitFlags, "--allow-insecure-entitlement=network.host")
} }
case "image":
d.image = v
default: default:
return nil, errors.Errorf("invalid driver option %s for docker-container driver") return nil, errors.Errorf("invalid driver option %s for docker-container driver", k)
} }
} }