Support environment variables in docker-container driver

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

View File

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