(GH-2028) cleanup

Author: arturcic

build/utils/docker.cake

@@ -176,18 +176,12 @@ string[] GetDockerTags(DockerImage dockerImage, BuildParameters parameters) {
 
 static string GetDockerCliPlatform(this ICakeContext context)
 {
-    var buildSystem = context.BuildSystem();
-    var ciSupportsDockerBuild = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted || buildSystem.IsRunningOnGitHubActions;
-
-    if (ciSupportsDockerBuild && context.Environment.Platform.Family != PlatformFamily.OSX || buildSystem.IsLocalBuild)
-    {
-        try {
-            var toolPath = context.FindToolInPath(context.IsRunningOnUnix() ? "docker" : "docker.exe");
-            return toolPath == null ? "" : context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", "");
-        }
-        catch (Exception) {
-            context.Warning("Docker is installed but the daemon not running");
-        }
+    try {
+        var toolPath = context.FindToolInPath(context.IsRunningOnUnix() ? "docker" : "docker.exe");
+        return toolPath == null ? "" : context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", "");
+    }
+    catch (Exception) {
+        context.Warning("Docker is installed but the daemon not running");
     }
     return "";
 }

build/utils/parameters.cake

@@ -71,7 +71,8 @@ public class BuildParameters
         var target = context.Argument("target", "Default");
         var buildSystem = context.BuildSystem();
 
-        var dockerCliPlatform = context.GetDockerCliPlatform();
+        var isReleasingCI = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted || buildSystem.IsRunningOnGitHubActions;
+        var dockerCliPlatform = isReleasingCI ? context.GetDockerCliPlatform() : "";
 
         return new BuildParameters {
             Target        = target,
@@ -97,7 +98,7 @@ public class BuildParameters
             IsRunningOnAzurePipeline = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted,
             IsRunningOnGitHubActions = buildSystem.IsRunningOnGitHubActions,
 
-            IsReleasingCI = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted || buildSystem.IsRunningOnGitHubActions,
+            IsReleasingCI = isReleasingCI,
 
             IsDockerForWindows = dockerCliPlatform == "windows",
             IsDockerForLinux   = dockerCliPlatform == "linux",