浏览代码

Merge pull request #8847 from ndeloof/compose_compatibility_env

COMPOSE_COMPATIBILITY can be set by .env file
Ulysses Souza 4 年之前
父节点
当前提交
4cb6ace1ce
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      cmd/compose/compose.go

+ 4 - 3
cmd/compose/compose.go

@@ -176,6 +176,10 @@ func (o *projectOptions) toProject(services []string, po ...cli.ProjectOptionsFn
 		return nil, compose.WrapComposeError(err)
 	}
 
+	if o.Compatibility || project.Environment["COMPOSE_COMPATIBILITY"] == "true" {
+		compose.Separator = "_"
+	}
+
 	if len(services) > 0 {
 		s, err := project.GetServices(services...)
 		if err != nil {
@@ -271,9 +275,6 @@ func RootCommand(backend api.Service) *cobra.Command {
 				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))
 			}
-			if opts.Compatibility || os.Getenv("COMPOSE_COMPATIBILITY") == "true" {
-				compose.Separator = "_"
-			}
 			return nil
 		},
 	}