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 #1513 from gtardif/fix_concurrent_map_writes 

Avoid panic: concurrent map writes
This commit is contained in:
Nicolas De loof 2021-04-20 14:28:13 +02:00 committed by GitHub
parent d86649140f b96dc49bcb
commit d37dffe5e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
local/compose/images.go
View File

@ -20,6 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"strings" "strings"
"sync"
moby "github.com/docker/docker/api/types" moby "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
@ -58,6 +59,7 @@ func (s *composeService) Images(ctx context.Context, projectName string, options
} }
images := map[string]moby.ImageInspect{} images := map[string]moby.ImageInspect{}
l := sync.Mutex{}
eg, ctx := errgroup.WithContext(ctx) eg, ctx := errgroup.WithContext(ctx)
for _, img := range imageIDs { for _, img := range imageIDs {
img := img img := img
@ -66,7 +68,9 @@ func (s *composeService) Images(ctx context.Context, projectName string, options
if err != nil { if err != nil {
return err return err
} }
l.Lock()
images[img] = inspect images[img] = inspect
l.Unlock()
return nil return nil
}) })
} }