docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-20 10:18:03 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1753 from nicksieger/compose-go-v1.13.4

Browse Source 
compose go v1.13.4
This commit is contained in:
Justin Chadwell
2023-05-10 09:25:10 +01:00
committed by GitHub
parent 4fa7cd1fc2 956a1be656
commit cb061b684c
34 changed files with 1130 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bake/compose.go
View File

@@ -28,10 +28,14 @@ func ParseComposeFiles(fs []File) (*Config, error) {
}
func ParseCompose(cfgs []compose.ConfigFile, envs map[string]string) (*Config, error) {
if envs == nil {
envs = make(map[string]string)
}
cfg, err := loader.Load(compose.ConfigDetails{
ConfigFiles: cfgs,
Environment: envs,
}, func(options *loader.Options) {
options.SetProjectName("bake", false)
options.SkipNormalization = true
})
if err != nil {
@@ -145,6 +149,7 @@ func validateCompose(dt []byte, envs map[string]string) error {
},
Environment: envs,
}, func(options *loader.Options) {
options.SetProjectName("bake", false)
options.SkipNormalization = true
// consistency is checked later in ParseCompose to ensure multiple
// compose files can be merged together