(build) build docker images with buildx

Author: arturcic

.github/workflows/ci.yml

@@ -265,6 +265,10 @@ jobs:
       with:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
+    -
+      name: '[Docker Build/Test] DockerHub'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
     -
       name: Login to DockerHub
       if: success() && github.event_name != 'pull_request'
@@ -273,9 +277,15 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
     -
-      name: '[Docker Build/Test/Publish] DockerHub'
+      name: '[Docker Publish] DockerHub'
+      if: success() && github.event_name != 'pull_request'
       shell: pwsh
       run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry dockerhub
+
+    -
+      name: '[Docker Build/Test] GitHub Container Registry'
+      shell: pwsh
+      run: dotnet run/docker.dll --target=DockerTest --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
     -
       name: Login to GitHub Container Registry
       if: success() && github.event_name != 'pull_request'
@@ -285,7 +295,8 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
     -
-      name: '[Docker Build/Test/Publish] GitHub Docker'
+      name: '[Docker Publish] GitHub Container Registry'
+      if: success() && github.event_name != 'pull_request'
       shell: pwsh
       run: dotnet run/docker.dll --target=DockerPublish --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }} --docker_registry github
 

build/common/Utilities/BuildContextBase.cs

@@ -15,7 +15,6 @@ protected BuildContextBase(ICakeContext context) : base(context)
         public bool IsPullRequest { get; set; }
         public bool IsTagged { get; set; }
         public bool IsLocalBuild { get; set; }
-        public bool IsAppVeyorBuild { get; set; }
         public bool IsAzurePipelineBuild { get; set; }
         public bool IsGitHubActionsBuild { get; set; }
         public bool IsOnWindows { get; set; }

build/common/Utilities/DockerContextExtensions.cs

@@ -12,13 +12,20 @@ namespace Common.Utilities
 {
     public static class DockerContextExtensions
     {
-        public static void DockerBuild(this BuildContextBase context, DockerImage dockerImage)
+        public static void DockerBuild(this BuildContextBase context, DockerImage dockerImage, bool pushImages)
         {
+            if (context.Version == null) return;
+
             var (distro, targetFramework, registry, _) = dockerImage;
             var workDir = Paths.Src.Combine("Docker");
             var tags = context.GetDockerTags(dockerImage);
 
-            if (context.Version == null) return;
+            var platforms = new List<string> { "linux/amd64" };
+            // if (targetFramework != "3.1" || !distro.StartsWith("alpine"))
+            // {
+            //     platforms.Add("linux/arm64");
+            // }
+
             var buildSettings = new DockerImageBuildSettings
             {
                 Rm = true,
@@ -32,11 +39,13 @@ public static void DockerBuild(this BuildContextBase context, DockerImage docker
                     $"DISTRO={distro}",
                     $"VERSION={context.Version.NugetVersion}"
                 },
-                // Pull = true,
-                // Platform = platform // TODO this one is not supported on docker versions < 18.02
+                Pull = true,
+                Platform = string.Join(",", platforms),
             };
 
-            context.DockerBuild(buildSettings, workDir.ToString());
+            var pushArg = pushImages ? "--push" : string.Empty;
+
+            context.DockerBuild(buildSettings, workDir.ToString(), pushArg);
         }
 
         public static void DockerPush(this BuildContextBase context, DockerImage dockerImage)
@@ -69,6 +78,31 @@ public static void DockerTestArtifact(this BuildContextBase context, DockerImage
             context.DockerTestRun(tag, "sh", cmd);
         }
 
+        private static void DockerBuild(
+            this ICakeContext context,
+            DockerImageBuildSettings settings,
+            string path, params string[] args)
+        {
+            GenericDockerRunner<DockerImageBuildSettings> genericDockerRunner =
+                new(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
+
+            string str1;
+            switch (string.IsNullOrEmpty(path))
+            {
+                case false:
+                    {
+                        string str2 = path.Trim();
+                        str1 = str2.Length <= 1 || !str2.StartsWith("\"") || !str2.EndsWith("\"") ? "\"" + path + "\"" : path;
+                        break;
+                    }
+                default:
+                    str1 = path;
+                    break;
+            }
+            var additional = args.Concat(new[] { str1 }).ToArray();
+            genericDockerRunner.Run("buildx build", settings, additional);
+        }
+
         private static void DockerTestRun(this BuildContextBase context, string image, string command, params string[] args)
         {
             var settings = GetDockerRunSettings(context);

build/docker/Tasks/DockerBuild.cs

@@ -11,6 +11,9 @@ namespace Docker.Tasks
     [TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
     public class DockerBuild : FrostingTask<BuildContext>
     {
+        protected bool PushImages { get; init; }
+        public DockerBuild() => this.PushImages = false;
+
         public override bool ShouldRun(BuildContext context)
         {
             var shouldRun = true;
@@ -28,7 +31,7 @@ public override void Run(BuildContext context)
 
             foreach (var dockerImage in context.Images)
             {
-                context.DockerBuild(dockerImage);
+                context.DockerBuild(dockerImage, PushImages);
             }
         }
     }

build/docker/Tasks/DockerPublish.cs

@@ -21,9 +21,9 @@ public override bool ShouldRun(BuildContext context)
 
     [TaskName(nameof(DockerPublishInternal))]
     [TaskDescription("Publish the docker images containing the GitVersion Tool")]
-    [IsDependentOn(typeof(DockerTest))]
-    public class DockerPublishInternal : FrostingTask<BuildContext>
+    public class DockerPublishInternal : DockerBuild
     {
+        public DockerPublishInternal() => this.PushImages = true;
         public override bool ShouldRun(BuildContext context)
         {
             var shouldRun = true;
@@ -33,13 +33,5 @@ public override bool ShouldRun(BuildContext context)
 
             return shouldRun;
         }
-
-        public override void Run(BuildContext context)
-        {
-            foreach (var dockerImage in context.Images)
-            {
-                context.DockerPush(dockerImage);
-            }
-        }
     }
 }