Sfoglia il codice sorgente

Merge pull request #10051 from ndeloof/9897

fix race condition collecting pulled images IDs
Milas Bowman 2 anni fa
parent
commit
b27ace6c55
1 ha cambiato i file con 1 aggiunte e 4 eliminazioni
  1. 1 4
      pkg/compose/pull.go

+ 1 - 4
pkg/compose/pull.go

@@ -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
 	})
 	})
 }
 }