Skip to content

Commit f96edcb

Browse files
authored
Merge pull request #4 from apppackio/transparent-build-args
Pass all config vars as build args to Docker
2 parents 4e9bc5b + 39fcdd7 commit f96edcb

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

builder/containers/containers.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,16 +196,21 @@ func (c *Containers) DeleteContainer(containerID string) error {
196196

197197
func (c *Containers) BuildImage(dockerfile string, config *BuildConfig) error {
198198
c.Log().Debug().Str("image", config.Image).Msg("building Docker image")
199-
cmd := exec.Command(
200-
"docker", "buildx", "build",
199+
dockerArgs := []string{
200+
"buildx",
201+
"build",
201202
"--tag", config.Image,
202203
"--progress", "plain",
203204
"--cache-to", fmt.Sprintf("type=local,dest=%s", config.CacheDir),
204205
"--cache-from", fmt.Sprintf("type=local,src=%s", config.CacheDir),
205206
"--file", dockerfile,
206207
"--load",
207-
".",
208-
)
208+
}
209+
for k, v := range config.Env {
210+
dockerArgs = append(dockerArgs, "--build-arg", fmt.Sprintf("%s=%s", k, v))
211+
}
212+
dockerArgs = append(dockerArgs, ".")
213+
cmd := exec.Command("docker", dockerArgs...)
209214
out := io.MultiWriter(os.Stdout, config.LogFile)
210215
cmd.Stdout = out
211216
cmd.Stderr = out

0 commit comments

Comments
 (0)