(build) cleanup

Author: arturcic

build/Directory.Packages.props

@@ -3,11 +3,13 @@
         <PackageReference Include="Cake.Codecov" Version="1.0.1"/>
         <PackageReference Include="Cake.Common" Version="1.1.0" />
         <PackageReference Include="Cake.Compression" Version="0.2.6" />
-        <PackageReference Include="Cake.Docker" Version="1.0.0" />
         <PackageReference Include="Cake.Coverlet" Version="2.5.4" />
+        <PackageReference Include="Cake.Docker" Version="1.0.0" />
         <PackageReference Include="Cake.Frosting" Version="1.1.0" />
-        <PackageReference Include="Cake.Incubator" Version="6.0.0" />
+        <PackageReference Include="Cake.Git" Version="1.1.0" />
+        <PackageReference Include="Cake.Kudu" Version="1.0.1" />
         <PackageReference Include="Cake.Json" Version="6.0.1" />
+        <PackageReference Include="Cake.Incubator" Version="6.0.0" />
         <PackageReference Include="Cake.Wyam" Version="2.2.12" />
     </ItemGroup>
 </Project>

build/common/Utilities/Models.cs

@@ -13,7 +13,7 @@ public record GitHubCredentials(string UserName, string Token);
 
     public record GitterCredentials(string Token, string RoomId);
 
-    public record DockerHubCredentials(string UserName, string Password);
+    public record DockerCredentials(string UserName, string Password);
 
     public record NugetCredentials(string ApiKey, string ApiUrl);
 

build/docker/BuildContext.cs

@@ -10,7 +10,7 @@ public class BuildContext : BuildContextBase
         public bool IsDockerOnLinux { get; set; }
 
         public Credentials? Credentials { get; set; }
-        public string DockerRegistry { get; set; } = Constants.GitHubContainerRegistry;
+        public string DockerRegistryPrefix { get; set; } = Constants.GitHubContainerRegistry;
         public IEnumerable<DockerImage> Images { get; set; } = new List<DockerImage>();
 
         public BuildContext(ICakeContext context) : base(context)

build/docker/BuildLifetime.cs

@@ -15,7 +15,6 @@ public override void Setup(BuildContext context)
             base.Setup(context);
 
             context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", "") == "linux";
-            context.Credentials = Credentials.GetCredentials(context);
 
             var dockerRegistry = context.Argument("docker_registry", "github").ToLower();
             var dotnetVersion = context.Argument("docker_dotnetversion", "").ToLower();
@@ -24,11 +23,13 @@ public override void Setup(BuildContext context)
             var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
             var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
 
-            context.DockerRegistry = dockerRegistry == "github" ? Constants.GitHubContainerRegistry : Constants.DockerHubRegistry;
+            context.DockerRegistryPrefix = dockerRegistry == "github" ? Constants.GitHubContainerRegistry : Constants.DockerHubRegistry;
             context.Images = from version in versions
                              from distro in distros
                              select new DockerImage(distro, version);
 
+            context.Credentials = Credentials.GetCredentials(context, dockerRegistry);
+
             context.StartGroup("Build Setup");
 
             LogBuildInformation(context);

build/docker/Tasks/DockerBuild.cs

@@ -26,7 +26,7 @@ public override void Run(BuildContext context)
 
             foreach (var dockerImage in context.Images)
             {
-                context.DockerBuild(dockerImage, context.DockerRegistry);
+                context.DockerBuild(dockerImage, context.DockerRegistryPrefix);
             }
         }
     }

build/docker/Tasks/DockerPublish.cs

@@ -1,4 +1,5 @@
 using System;
+using Cake.Common.Diagnostics;
 using Cake.Frosting;
 using Common.Utilities;
 
@@ -21,6 +22,7 @@ public override bool ShouldRun(BuildContext context)
 
         public override void Run(BuildContext context)
         {
+            context.Information($"Docker image prefix: {context.DockerRegistryPrefix}");
             var username = context.Credentials?.Docker?.UserName;
             if (string.IsNullOrEmpty(username))
             {
@@ -35,7 +37,7 @@ public override void Run(BuildContext context)
 
             foreach (var dockerImage in context.Images)
             {
-                context.DockerPush(dockerImage, context.DockerRegistry);
+                context.DockerPush(dockerImage, context.DockerRegistryPrefix);
             }
         }
     }

build/docker/Tasks/DockerTest.cs

@@ -22,7 +22,7 @@ public override void Run(BuildContext context)
 
             foreach (var dockerImage in context.Images)
             {
-                var tags = context.GetDockerTagsForRepository(dockerImage, context.DockerRegistry);
+                var tags = context.GetDockerTagsForRepository(dockerImage, context.DockerRegistryPrefix);
                 foreach (var tag in tags)
                 {
                     context.DockerTestRun(settings, tag, "/repo", "/showvariable", "FullSemver");

build/docker/Utilities/Credentials.cs

@@ -6,17 +6,16 @@ namespace Docker.Utilities
 {
     public class Credentials
     {
-        public GitHubCredentials? GitHub { get; private set; }
-        public DockerHubCredentials? Docker { get; private set; }
-        public static Credentials GetCredentials(ICakeContext context) => new()
+        public DockerCredentials? Docker { get; private set; }
+        public static Credentials GetCredentials(ICakeContext context, string dockerRegistry) => new()
         {
-            GitHub = new GitHubCredentials(
-                context.EnvironmentVariable("GITHUB_USERNAME"),
-                context.EnvironmentVariable("GITHUB_TOKEN")),
-
-            Docker = new DockerHubCredentials(
-                context.EnvironmentVariable("DOCKER_USERNAME"),
-                context.EnvironmentVariable("DOCKER_PASSWORD")),
+            Docker = dockerRegistry == "github"
+                ? new DockerCredentials(
+                    context.EnvironmentVariable("GITHUB_USERNAME"),
+                    context.EnvironmentVariable("GITHUB_TOKEN"))
+                : new DockerCredentials(
+                    context.EnvironmentVariable("DOCKER_USERNAME"),
+                    context.EnvironmentVariable("DOCKER_PASSWORD"))
         };
     }
 }

build/docs/BuildContext.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using Cake.Core;
 using Cake.Wyam;
 using Common.Utilities;