cleanup

arturcic · arturcic · commit d1e0e2fb3a30 · 2024-02-08T11:33:07.000+01:00
diff --git a/build/.run/DockerBuild (sdk).run.xml b/build/.run/DockerBuild (sdk).run.xml
@@ -1,7 +1,7 @@
 ﻿<component name="ProjectRunConfigurationManager">
   <configuration default="false" name="DockerBuild (sdk)" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=6.0 --dotnet_variant=sdk --dotnet_distro=alpine.3.17 --docker_registry=github --verbosity=diagnostic" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --dotnet_version=8.0 --dotnet_variant=sdk --dotnet_distro=alpine.3.17 --docker_registry=github --verbosity=diagnostic --push_images=true" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
@@ -17,4 +17,4 @@
       <option name="Build" />
     </method>
   </configuration>
-</component>
+</component>
diff --git a/build/build/Infra/DockerExtensions.cs b/build/build/Infra/DockerExtensions.cs
@@ -1,20 +1,27 @@
 namespace Build;
+
 using DockerBuildXBuildSettings = Build.Cake.Docker.DockerBuildXBuildSettings;
 using DockerBuildXImageToolsCreateSettings = Build.Cake.Docker.DockerBuildXImageToolsCreateSettings;
 
 public static class DockerExtensions
 {
-    public static void DockerBuildXBuild(this ICakeContext context, DockerBuildXBuildSettings settings, DirectoryPath target)
+    public static void DockerBuildXBuild(this ICakeContext context, DockerBuildXBuildSettings settings,
+        DirectoryPath target)
     {
         ArgumentNullException.ThrowIfNull(context);
-        var runner = new GenericDockerRunner<DockerBuildXBuildSettings>(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
+        var runner = context.CreateRunner<DockerBuildXBuildSettings>();
         runner.Run("buildx build", settings, [target.ToString().EscapeProcessArgument()]);
     }
 
-    public static void DockerBuildXImageToolsCreate(this ICakeContext context, DockerBuildXImageToolsCreateSettings settings, IEnumerable<string>? target = null)
+    public static void DockerBuildXImageToolsCreate(this ICakeContext context,
+        DockerBuildXImageToolsCreateSettings settings, IEnumerable<string>? target = null)
     {
         ArgumentNullException.ThrowIfNull(context);
-        var runner = new GenericDockerRunner<DockerBuildXImageToolsCreateSettings>(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
+        var runner = context.CreateRunner<DockerBuildXImageToolsCreateSettings>();
         runner.Run("buildx imagetools create", settings, target?.ToArray() ?? []);
     }
+
+    private static GenericDockerRunner<TSettings> CreateRunner<TSettings>(this ICakeContext context)
+        where TSettings : AutoToolSettings, new() =>
+        new(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
 }
diff --git a/build/build/Tasks/DockerBaseTask.cs b/build/build/Tasks/DockerBaseTask.cs
@@ -64,11 +64,11 @@ protected virtual DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage doc
         var buildSettings = new DockerBuildXBuildSettings
         {
             Rm = true,
+            Pull = true,
+            // NoCache = true,
             Tag = dockerTags,
             Platform = [$"linux/{suffix}"],
             Output = ["type=docker,oci-mediatypes=true"],
-            Pull = true,
-            // NoCache = true,
             Label =
             [
                 "maintainers=GitTools Maintainers",

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,27 @@`
`1`	`1`	`namespace Build;`
	`2`	`+`
`2`	`3`	`using DockerBuildXBuildSettings = Build.Cake.Docker.DockerBuildXBuildSettings;`
`3`	`4`	`using DockerBuildXImageToolsCreateSettings = Build.Cake.Docker.DockerBuildXImageToolsCreateSettings;`
`4`	`5`
`5`	`6`	`public static class DockerExtensions`
`6`	`7`	`{`
`7`		`- public static void DockerBuildXBuild(this ICakeContext context, DockerBuildXBuildSettings settings, DirectoryPath target)`
	`8`	`+ public static void DockerBuildXBuild(this ICakeContext context, DockerBuildXBuildSettings settings,`
	`9`	`+ DirectoryPath target)`
`8`	`10`	`{`
`9`	`11`	`ArgumentNullException.ThrowIfNull(context);`
`10`		`- var runner = new GenericDockerRunner<DockerBuildXBuildSettings>(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);`
	`12`	`+ var runner = context.CreateRunner<DockerBuildXBuildSettings>();`
`11`	`13`	`runner.Run("buildx build", settings, [target.ToString().EscapeProcessArgument()]);`
`12`	`14`	`}`
`13`	`15`
`14`		`- public static void DockerBuildXImageToolsCreate(this ICakeContext context, DockerBuildXImageToolsCreateSettings settings, IEnumerable<string>? target = null)`
	`16`	`+ public static void DockerBuildXImageToolsCreate(this ICakeContext context,`
	`17`	`+ DockerBuildXImageToolsCreateSettings settings, IEnumerable<string>? target = null)`
`15`	`18`	`{`
`16`	`19`	`ArgumentNullException.ThrowIfNull(context);`
`17`		`- var runner = new GenericDockerRunner<DockerBuildXImageToolsCreateSettings>(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);`
	`20`	`+ var runner = context.CreateRunner<DockerBuildXImageToolsCreateSettings>();`
`18`	`21`	`runner.Run("buildx imagetools create", settings, target?.ToArray() ?? []);`
`19`	`22`	`}`
	`23`	`+`
	`24`	`+ private static GenericDockerRunner<TSettings> CreateRunner<TSettings>(this ICakeContext context)`
	`25`	`+ where TSettings : AutoToolSettings, new() =>`
	`26`	`+ new(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);`
`20`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,11 @@ protected virtual DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage doc`
`64`	`64`	`var buildSettings = new DockerBuildXBuildSettings`
`65`	`65`	`{`
`66`	`66`	`Rm = true,`
	`67`	`+ Pull = true,`
	`68`	`+ // NoCache = true,`
`67`	`69`	`Tag = dockerTags,`
`68`	`70`	`Platform = [$"linux/{suffix}"],`
`69`	`71`	`Output = ["type=docker,oci-mediatypes=true"],`
`70`		`- Pull = true,`
`71`		`- // NoCache = true,`
`72`	`72`	`Label =`
`73`	`73`	`[`
`74`	`74`	`"maintainers=GitTools Maintainers",`