(cleanup) small build script changes

Author: arturcic

build.cake

@@ -432,13 +432,7 @@ Task("Docker-Build")
     .IsDependentOn("Copy-Files")
     .Does<BuildParameters>((parameters) =>
 {
-    var images = parameters.IsRunningOnWindows
-            ? parameters.Docker.Windows
-            : parameters.IsRunningOnLinux
-                ? parameters.Docker.Linux
-                : Array.Empty<DockerImage>();
-
-    foreach(var dockerImage in images)
+    foreach(var dockerImage in parameters.Docker.Images)
     {
         DockerBuild(dockerImage, parameters);
     }
@@ -458,13 +452,7 @@ Task("Docker-Test")
         Volume = new[] { $"{currentDir}:{containerDir}" }
     };
 
-    var images = parameters.IsRunningOnWindows
-            ? parameters.Docker.Windows
-            : parameters.IsRunningOnLinux
-                ? parameters.Docker.Linux
-                : Array.Empty<DockerImage>();
-
-    foreach(var dockerImage in images)
+    foreach(var dockerImage in parameters.Docker.Images)
     {
         var tags = GetDockerTags(dockerImage, parameters);
         foreach (var tag in tags)
@@ -694,13 +682,7 @@ Task("Publish-DockerHub")
 
     DockerStdinLogin(username, password);
 
-    var images = parameters.IsRunningOnWindows
-            ? parameters.Docker.Windows
-            : parameters.IsRunningOnLinux
-                ? parameters.Docker.Linux
-                : Array.Empty<DockerImage>();
-
-    foreach(var dockerImage in images)
+    foreach(var dockerImage in parameters.Docker.Images)
     {
         DockerPush(dockerImage, parameters);
     }

build/artifacts.cake

@@ -96,17 +96,24 @@ public class BuildArtifact
 
 public class DockerImages
 {
-    public ICollection<DockerImage> Windows { get; private set; }
-    public ICollection<DockerImage> Linux { get; private set; }
+    public ICollection<DockerImage> Images { get; private set; }
 
-    public static DockerImages GetDockerImages(ICakeContext context, FilePath[] dockerfiles)
+    public static DockerImages GetDockerImages(BuildParameters parameters, FilePath[] dockerfiles)
     {
         var toDockerImage = DockerImage();
         var dockerImages = dockerfiles.Select(toDockerImage).ToArray();
 
+        var windowsImages = dockerImages.Where(x => x.OS == "windows").ToArray();
+        var linuxImages = dockerImages.Where(x => x.OS == "linux").ToArray();
+
+        var images = parameters.IsRunningOnWindows
+            ? windowsImages
+            : parameters.IsRunningOnLinux
+                ? linuxImages
+                : Array.Empty<DockerImage>();
+
         return new DockerImages {
-            Windows = dockerImages.Where(x => x.OS == "windows").ToArray(),
-            Linux = dockerImages.Where(x => x.OS == "linux").ToArray(),
+            Images = images
         };
     }
 

build/parameters.cake

@@ -93,7 +93,7 @@ public class BuildParameters
         Paths = BuildPaths.GetPaths(context, this, Configuration, Version);
 
         var dockerFiles = context.GetFiles("./src/**/Dockerfile").ToArray();
-        Docker = DockerImages.GetDockerImages(context, dockerFiles);
+        Docker = DockerImages.GetDockerImages(this, dockerFiles);
 
         Packages = BuildPackages.GetPackages(
             Paths.Directories.NugetRoot,