mirror of https://github.com/docker/compose.git
Merge pull request #10051 from ndeloof/9897
fix race condition collecting pulled images IDs
This commit is contained in:
commit
b27ace6c55
|
@ -294,15 +294,12 @@ func (s *composeService) pullRequiredImages(ctx context.Context, project *types.
|
||||||
return err
|
return err
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
err := eg.Wait()
|
||||||
for i, service := range needPull {
|
for i, service := range needPull {
|
||||||
if pulledImages[i] != "" {
|
if pulledImages[i] != "" {
|
||||||
images[service.Image] = pulledImages[i]
|
images[service.Image] = pulledImages[i]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
err := eg.Wait()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return err
|
return err
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue