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 #978 from gtardif/fix_compose_up_display 

Ensure images are pulled/build with build first, before creating networks / volumes.
This commit is contained in:
Nicolas De loof 2020-11-27 14:32:50 +01:00 committed by GitHub
parent c0805464f5 bc9099de9b
commit e94646f56a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
local/compose.go
View File

@ -54,6 +54,10 @@ type composeService struct {
} }
func (s *composeService) Up(ctx context.Context, project *types.Project, detach bool) error { func (s *composeService) Up(ctx context.Context, project *types.Project, detach bool) error {
err := s.ensureImagesExists(ctx, project)
if err != nil {
return err
}
for k, network := range project.Networks { for k, network := range project.Networks {
if !network.External.External && network.Name != "" { if !network.External.External && network.Name != "" {
network.Name = fmt.Sprintf("%s_%s", project.Name, k) network.Name = fmt.Sprintf("%s_%s", project.Name, k)
@ -82,11 +86,6 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, detach
} }
} }
err := s.ensureImagesExists(ctx, project)
if err != nil {
return err
}
err = inDependencyOrder(ctx, project, func(c context.Context, service types.ServiceConfig) error { err = inDependencyOrder(ctx, project, func(c context.Context, service types.ServiceConfig) error {
return s.ensureService(c, project, service) return s.ensureService(c, project, service)
}) })