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

Support environment variables in docker-container driver

Browse Source 
Fixes #169

Signed-off-by: Sune Keller <absukl@almbrand.dk>
This commit is contained in:
Sune Keller 2019-10-12 15:16:27 +08:00 committed by Sune Keller
parent 43edd6b77e
commit fd44accc79
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ type Driver struct {
factory driver.Factory factory driver.Factory
netMode string netMode string
image string image string
env []string
} }
func (d *Driver) Bootstrap(ctx context.Context, l progress.Logger) error { func (d *Driver) Bootstrap(ctx context.Context, l progress.Logger) error {
@ -57,6 +58,7 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
if d.image != "" { if d.image != "" {
imageName = d.image imageName = d.image
} }
env := d.env
if err := l.Wrap("pulling image "+imageName, func() error { if err := l.Wrap("pulling image "+imageName, func() error {
rc, err := d.DockerAPI.ImageCreate(ctx, imageName, types.ImageCreateOptions{}) rc, err := d.DockerAPI.ImageCreate(ctx, imageName, types.ImageCreateOptions{})
if err != nil { if err != nil {
@ -70,6 +72,7 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
cfg := &container.Config{ cfg := &container.Config{
Image: imageName, Image: imageName,
Env: env,
} }
if d.InitConfig.BuildkitFlags != nil { if d.InitConfig.BuildkitFlags != nil {
cfg.Cmd = d.InitConfig.BuildkitFlags cfg.Cmd = d.InitConfig.BuildkitFlags

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

@ -2,6 +2,8 @@ package docker
import ( import (
"context" "context"
"fmt"
"strings"
"github.com/docker/buildx/driver" "github.com/docker/buildx/driver"
dockerclient "github.com/docker/docker/client" dockerclient "github.com/docker/docker/client"
@ -39,14 +41,20 @@ func (f *factory) New(ctx context.Context, cfg driver.InitConfig) (driver.Driver
} }
d := &Driver{factory: f, InitConfig: cfg} d := &Driver{factory: f, InitConfig: cfg}
for k, v := range cfg.DriverOpts { for k, v := range cfg.DriverOpts {
switch k { switch {
case "network": case k == "network":
d.netMode = v d.netMode = v
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": case k == "image":
d.image = v d.image = v
case strings.HasPrefix(k, "env."):
envName := strings.TrimPrefix(k, "env.")
if envName == "" {
return nil, errors.Errorf("invalid env option %q, expecting env.FOO=bar", k)
}
d.env = append(d.env, fmt.Sprintf("%s=%s", envName, v))
default: default:
return nil, errors.Errorf("invalid driver option %s for docker-container driver", k) return nil, errors.Errorf("invalid driver option %s for docker-container driver", k)
} }