tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8847 from ndeloof/compose_compatibility_env 

COMPOSE_COMPATIBILITY can be set by .env file
This commit is contained in:
Ulysses Souza 2021-10-28 12:55:50 +01:00 committed by GitHub
parent 9d04f3ff73 c4cfaeb12a
commit 4cb6ace1ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/compose/compose.go
View File

@ -176,6 +176,10 @@ func (o *projectOptions) toProject(services []string, po ...cli.ProjectOptionsFn
return nil, compose.WrapComposeError(err) return nil, compose.WrapComposeError(err)
} }
if o.Compatibility || project.Environment["COMPOSE_COMPATIBILITY"] == "true" {
compose.Separator = "_"
}
if len(services) > 0 { if len(services) > 0 {
s, err := project.GetServices(services...) s, err := project.GetServices(services...)
if err != nil { if err != nil {
@ -271,9 +275,6 @@ func RootCommand(backend api.Service) *cobra.Command {
opts.ProjectDir = opts.WorkDir opts.ProjectDir = opts.WorkDir
fmt.Fprint(os.Stderr, aec.Apply("option '--workdir' is DEPRECATED at root level! Please use '--project-directory' instead.\n", aec.RedF)) fmt.Fprint(os.Stderr, aec.Apply("option '--workdir' is DEPRECATED at root level! Please use '--project-directory' instead.\n", aec.RedF))
} }
if opts.Compatibility || os.Getenv("COMPOSE_COMPATIBILITY") == "true" {
compose.Separator = "_"
}
return nil return nil
}, },
} }