tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-09-25 18:48:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

only load COMPOSE_* from $PWD/.env

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2025-08-28 17:01:19 +02:00 committed by Guillaume Lours
parent 7cd569922e
commit b387ba4a05
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/compose/compose.go
View File

@ -693,7 +693,7 @@ func setEnvWithDotEnv(opts ProjectOptions) error {
return nil return nil
} }
for k, v := range envFromFile { for k, v := range envFromFile {
if _, ok := os.LookupEnv(k); !ok { if _, ok := os.LookupEnv(k); !ok && strings.HasPrefix(k, "COMPOSE_") {
if err = os.Setenv(k, v); err != nil { if err = os.Setenv(k, v); err != nil {
return nil return nil
} }

6
cmd/compose/run.go
View File

@ -120,8 +120,8 @@ func (options runOptions) apply(project *types.Project) (*types.Project, error)
return project, nil return project, nil
} }
func (options runOptions) getEnvironment() (types.Mapping, error) { func (options runOptions) getEnvironment(resolve func(string) (string, bool)) (types.Mapping, error) {
environment := types.NewMappingWithEquals(options.environment).Resolve(os.LookupEnv).ToMapping() environment := types.NewMappingWithEquals(options.environment).Resolve(resolve).ToMapping()
for _, file := range options.envFiles { for _, file := range options.envFiles {
f, err := os.Open(file) f, err := os.Open(file)
if err != nil { if err != nil {
@ -289,7 +289,7 @@ func runRun(ctx context.Context, backend api.Service, project *types.Project, op
buildForRun = &bo buildForRun = &bo
} }
environment, err := options.getEnvironment() environment, err := options.getEnvironment(project.Environment.Resolve)
if err != nil { if err != nil {
return err return err
} }