bake: replace env in compose files

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
pull/117/head
Tonis Tiigi 6 years ago
parent 3f18b659a0
commit 662c0768cb

@ -2,7 +2,9 @@ package bake
import ( import (
"fmt" "fmt"
"os"
"reflect" "reflect"
"strings"
"github.com/docker/cli/cli/compose/loader" "github.com/docker/cli/cli/compose/loader"
composetypes "github.com/docker/cli/cli/compose/types" composetypes "github.com/docker/cli/cli/compose/types"
@ -19,9 +21,22 @@ func parseCompose(dt []byte) (*composetypes.Config, error) {
Config: parsed, Config: parsed,
}, },
}, },
Environment: envMap(os.Environ()),
}) })
} }
func envMap(env []string) map[string]string {
result := make(map[string]string, len(env))
for _, s := range env {
kv := strings.SplitN(s, "=", 2)
if len(kv) != 2 {
continue
}
result[kv[0]] = kv[1]
}
return result
}
func ParseCompose(dt []byte) (*Config, error) { func ParseCompose(dt []byte) (*Config, error) {
cfg, err := parseCompose(dt) cfg, err := parseCompose(dt)
if err != nil { if err != nil {

Loading…
Cancel
Save