Merge pull request docker#10151 from freeformz/ffz/NoShareMap

glours · web-flow · commit 00c60da331e7 · 2023-01-09T12:13:48.000+01:00
Don't share the options map
diff --git a/pkg/compose/build.go b/pkg/compose/build.go
@@ -48,7 +48,6 @@ func (s *composeService) Build(ctx context.Context, project *types.Project, opti
 }
 
 func (s *composeService) build(ctx context.Context, project *types.Project, options api.BuildOptions) error {
-	opts := map[string]build.Options{}
 	args := flatten(options.Args.Resolve(envResolver(project.Environment)))
 
 	return InDependencyOrder(ctx, project, func(ctx context.Context, name string) error {
@@ -92,7 +91,7 @@ func (s *composeService) build(ctx context.Context, project *types.Project, opti
 				Attrs: map[string]string{},
 			}}
 		}
-		opts[imageName] = buildOptions
+		opts := map[string]build.Options{imageName: buildOptions}
 		_, err = s.doBuild(ctx, project, opts, options.Progress)
 		return err
 	}, func(traversal *graphTraversal) {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ func (s composeService) Build(ctx context.Context, project types.Project, opti`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func (s composeService) build(ctx context.Context, project types.Project, options api.BuildOptions) error {`
`51`		`- opts := map[string]build.Options{}`
`52`	`51`	`args := flatten(options.Args.Resolve(envResolver(project.Environment)))`
`53`	`52`
`54`	`53`	`return InDependencyOrder(ctx, project, func(ctx context.Context, name string) error {`
`@@ -92,7 +91,7 @@ func (s composeService) build(ctx context.Context, project types.Project, opti`
`92`	`91`	`Attrs: map[string]string{},`
`93`	`92`	`}}`
`94`	`93`	`}`
`95`		`- opts[imageName] = buildOptions`
	`94`	`+ opts := map[string]build.Options{imageName: buildOptions}`
`96`	`95`	`_, err = s.doBuild(ctx, project, opts, options.Progress)`
`97`	`96`	`return err`
`98`	`97`	`}, func(traversal *graphTraversal) {`