docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-30 01:15:45 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #117 from tonistiigi/compose-env

Browse Source 
bake: replace env in compose files
This commit is contained in:
Tibor Vass 2019-07-30 19:14:21 -07:00 committed by GitHub
commit 73645c8348
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bake/compose.go
View File

@ -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 {