diff --git a/cli/compose/loader/loader_test.go b/cli/compose/loader/loader_test.go index d956fb9f5fe4..6acdacc160a7 100644 --- a/cli/compose/loader/loader_test.go +++ b/cli/compose/loader/loader_test.go @@ -1583,6 +1583,7 @@ services: }, } for _, testcase := range testcases { + testcase := testcase t.Run(testcase.doc, func(t *testing.T) { config, err := loadYAML(testcase.yaml) assert.NilError(t, err) diff --git a/cli/compose/loader/merge.go b/cli/compose/loader/merge.go index 24b74ffbc596..015b1f5a55ef 100644 --- a/cli/compose/loader/merge.go +++ b/cli/compose/loader/merge.go @@ -60,6 +60,7 @@ func mergeServices(base, override []types.ServiceConfig) ([]types.ServiceConfig, }, } for name, overrideService := range overrideServices { + overrideService := overrideService if baseService, ok := baseServices[name]; ok { if err := mergo.Merge(&baseService, &overrideService, mergo.WithAppendSlice, mergo.WithOverride, mergo.WithTransformers(specials)); err != nil { return base, errors.Wrapf(err, "cannot merge service %s", name)