Fix RebuildStaleImages command to generate dependency graph (dotnet#217)

Ensures that the set of paths produced by the RebuildStaleImages command consists of the image whose base image had changed as well as its dependent images.
MichaelSimons · Jun 24, 2019 · ae98840 · ae98840
1 parent 617ce76
commit ae98840
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,5 +7,6 @@
 .vscode/
 .vs
 
-# Visual Studio debug profile
+# Visual Studio user-specific files
 **/launchSettings.json
+**/*.user
diff --git a/Microsoft.DotNet.ImageBuilder/src/Commands/RebuildStaleImagesCommand.cs b/Microsoft.DotNet.ImageBuilder/src/Commands/RebuildStaleImagesCommand.cs
@@ -119,6 +119,8 @@ private async Task<IEnumerable<string>> GetPathsToRebuildAsync(Subscription subs
 
             List<string> pathsToRebuild = new List<string>();
 
+            IEnumerable<PlatformInfo> allPlatforms = manifest.GetAllPlatforms().ToList();
+
             foreach (RepoInfo repo in manifest.FilteredRepos)
             {
                 IEnumerable<PlatformInfo> platforms = repo.FilteredImages
@@ -127,19 +129,28 @@ private async Task<IEnumerable<string>> GetPathsToRebuildAsync(Subscription subs
                 RepoData repoData = repos
                     .FirstOrDefault(s => s.Repo == repo.Model.Name);
 
+                HashSet<string> processedImages = new HashSet<string>();
                 foreach (var platform in platforms)
                 {
                     if (repoData != null &&
                         repoData.Images != null &&
                         repoData.Images.TryGetValue(platform.BuildContextPath, out ImageData imageData))
                     {
                         bool hasDigestChanged = false;
+
                         foreach (string fromImage in platform.ExternalFromImages)
                         {
+                            if (processedImages.Contains(fromImage))
+                            {
+                                continue;
+                            }
+
                             DockerHelper.PullImage(fromImage, Options.IsDryRun);
                             string currentDigest = DockerHelper.GetImageDigest(fromImage, Options.IsDryRun);
                             string lastDigest = imageData.BaseImages?[fromImage];
 
+                            processedImages.Add(fromImage);
+
                             if (lastDigest != currentDigest)
                             {
                                 hasDigestChanged = true;
@@ -149,7 +160,8 @@ private async Task<IEnumerable<string>> GetPathsToRebuildAsync(Subscription subs
 
                         if (hasDigestChanged)
                         {
-                            pathsToRebuild.Add(platform.BuildContextPath);
+                            IEnumerable<PlatformInfo> dependentPlatforms = platform.GetDependencyGraph(allPlatforms);
+                            pathsToRebuild.AddRange(dependentPlatforms.Select(p => p.BuildContextPath));
                         }
                     }
                     else
@@ -160,7 +172,7 @@ private async Task<IEnumerable<string>> GetPathsToRebuildAsync(Subscription subs
                 }
             }
 
-            return pathsToRebuild;
+            return pathsToRebuild.Distinct().ToList();
         }
 
         private async Task<string> GetGitRepoPath(Subscription sub)

diff --git a/Microsoft.DotNet.ImageBuilder/src/ViewModel/ManifestInfo.cs b/Microsoft.DotNet.ImageBuilder/src/ViewModel/ManifestInfo.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -71,7 +72,7 @@ private static ManifestInfo Create(string manifestPath, ManifestFilter manifestF
                 .ToArray();
 
             IEnumerable<string> repoNames = manifestInfo.AllRepos.Select(repo => repo.Name).ToArray();
-            foreach (PlatformInfo platform in manifestInfo.AllRepos.SelectMany(repo => repo.AllImages).SelectMany(image => image.AllPlatforms))
+            foreach (PlatformInfo platform in manifestInfo.GetAllPlatforms())
             {
                 platform.Initialize(repoNames, manifestInfo.Registry);
             }
@@ -84,10 +85,13 @@ private static ManifestInfo Create(string manifestPath, ManifestFilter manifestF
             return manifestInfo;
         }
 
+        public IEnumerable<ImageInfo> GetAllImages() => AllRepos.SelectMany(repo => repo.AllImages);
+
+        public IEnumerable<PlatformInfo> GetAllPlatforms() => GetAllImages().SelectMany(image => image.AllPlatforms);
+
         private IEnumerable<TagInfo> GetAllTags()
         {
-            IEnumerable<ImageInfo> images = AllRepos
-                .SelectMany(repo => repo.AllImages)
+            IEnumerable<ImageInfo> images = GetAllImages()
                 .ToArray();
             IEnumerable<TagInfo> sharedTags = images
                 .SelectMany(image => image.SharedTags);