Explorar o código

Merge pull request #978 from gtardif/fix_compose_up_display

Ensure images are pulled/build with build first, before creating networks / volumes.
Nicolas De loof %!s(int64=4) %!d(string=hai) anos
pai
achega
e94646f56a
Modificáronse 1 ficheiros con 4 adicións e 5 borrados
  1. 4 5
      local/compose.go

+ 4 - 5
local/compose.go

@@ -54,6 +54,10 @@ type composeService struct {
 }
 
 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 {
 		if !network.External.External && network.Name != "" {
 			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 {
 		return s.ensureService(c, project, service)
 	})