(docker) using a template of dockerfile, reading the docker configs from docker.json

Author: arturcic

build/utils/artifacts.cake

@@ -98,10 +98,21 @@ public class DockerImages
 {
     public ICollection<DockerImage> Images { get; private set; }
 
-    public static DockerImages GetDockerImages(BuildParameters parameters, FilePath[] dockerfiles)
+    public static DockerImages GetDockerImages(ICakeContext context, BuildParameters parameters)
     {
-        var toDockerImage = DockerImage();
-        var dockerImages = dockerfiles.Select(toDockerImage).ToArray();
+        var dockerJson = context.ParseJsonFromFile("./src/Docker/docker.json");
+
+        var dockerImages = new List<DockerImage>();
+        foreach (var osItem in dockerJson.Properties())
+        {
+            foreach (var targetFramework in ((JObject)osItem.Value).Properties())
+            {
+                foreach (var distro in ((JArray)targetFramework.Value))
+                {
+                    dockerImages.Add(new DockerImage(os: osItem.Name, distro: distro.ToString(), targetFramework: $"netcoreapp{targetFramework.Name}"));
+                }
+            }
+        }
 
         var windowsImages = dockerImages.Where(x => x.OS == "windows").ToArray();
         var linuxImages = dockerImages.Where(x => x.OS == "linux").ToArray();
@@ -116,17 +127,6 @@ public class DockerImages
             Images = images
         };
     }
-
-    private static Func<FilePath, DockerImage> DockerImage()
-    {
-        return dockerFile => {
-            var segments = dockerFile.Segments.Reverse().ToArray();
-            var distro = segments[1];
-            var os = segments[2];
-            var targetFramework = segments[3];
-            return new DockerImage(os: os, distro: distro, targetFramework: targetFramework);
-        };
-    }
 }
 
 public class DockerImage

build/utils/docker.cake

@@ -26,7 +26,7 @@ void DockerStdinLogin(string username, string password)
 void DockerBuild(DockerImage dockerImage, BuildParameters parameters)
 {
     var (os, distro, targetframework) = dockerImage;
-    var workDir = DirectoryPath.FromString($"./src/Docker/{targetframework}/{os}/{distro}");
+    var workDir = DirectoryPath.FromString($"./src/Docker");
 
     var sourceDir = targetframework.StartsWith("netcoreapp")
         ? parameters.Paths.Directories.ArtifactsBinCoreFx.Combine("tools")
@@ -41,7 +41,7 @@ void DockerBuild(DockerImage dockerImage, BuildParameters parameters)
         Rm = true,
         Tag = tags,
         File = $"{workDir}/Dockerfile",
-        BuildArg = new []{ $"contentFolder=/content" },
+        BuildArg = new []{ $"contentFolder=/content", "DOTNET_VARIANT=runtime", $"DOTNET_VERSION={targetframework.Replace("netcoreapp", "")}", $"DISTRO={distro}" },
         // Pull = true,
         // Platform = platform // TODO this one is not supported on docker versions < 18.02
     };
@@ -99,7 +99,7 @@ string[] GetDockerTags(DockerImage dockerImage, BuildParameters parameters) {
         $"{name}:{parameters.Version.SemVersion}-{os}-{distro}-{targetframework}",
     };
 
-    if (distro == "debian" && targetframework == parameters.CoreFxVersion || distro == "nano") {
+    if (distro == "debian-9" && targetframework == parameters.CoreFxVersion || distro == "nanoserver-1809") {
         tags.AddRange(new[] {
             $"{name}:{parameters.Version.Version}-{os}",
             $"{name}:{parameters.Version.SemVersion}-{os}",

build/utils/parameters.cake

@@ -61,8 +61,9 @@ public class BuildParameters
         var target = context.Argument("target", "Default");
         var buildSystem = context.BuildSystem();
 
-        var dockerCliPlatform = buildSystem.IsRunningOnAzurePipelinesHosted
-                                && context.Environment.Platform.Family != PlatformFamily.OSX
+        var dockerCliPlatform = (buildSystem.IsRunningOnAzurePipelinesHosted
+                                && context.Environment.Platform.Family != PlatformFamily.OSX)
+                                || buildSystem.IsLocalBuild
                                 ? GetDockerCliPlatform(context) : "";
 
         return new BuildParameters {
@@ -102,8 +103,7 @@ public class BuildParameters
 
         Paths = BuildPaths.GetPaths(context, this, Configuration, Version);
 
-        var dockerFiles = context.GetFiles("./src/**/Dockerfile").ToArray();
-        Docker = DockerImages.GetDockerImages(this, dockerFiles);
+        Docker = DockerImages.GetDockerImages(context, this);
 
         Packages = BuildPackages.GetPackages(
             Paths.Directories.NugetRoot,

src/Docker/Dockerfile

@@ -0,0 +1,11 @@
+ARG DISTRO='debian-9'
+ARG DOTNET_VERSION='2.1'
+ARG DOTNET_VARIANT='runtime'
+
+FROM gittools/build-images:$DISTRO-$DOTNET_VARIANT-$DOTNET_VERSION
+ARG contentFolder
+
+WORKDIR /app
+COPY $contentFolder/ ./
+
+ENTRYPOINT ["dotnet", "GitVersion.dll"]

src/Docker/docker.json

@@ -0,0 +1,26 @@
+{
+    "linux": {
+        "2.1": [
+            "centos-7",
+            "debian-9",
+            "fedora-27",
+            "ubuntu-16.04",
+            "ubuntu-18.04"
+        ],
+        "2.2": [
+            "centos-7",
+            "debian-9",
+            "fedora-27",
+            "ubuntu-16.04",
+            "ubuntu-18.04"
+        ]
+    },
+    "windows": {
+        "2.1": [
+            "nanoserver-1809"
+        ],
+        "2.2": [
+            "nanoserver-1809"
+        ]
+    }
+}