tar path

Author: arturcic

.github/workflows/build-deps.yml

@@ -85,7 +85,7 @@ jobs:
 #    -
 #      name: '[Build Docker images]'
 #      shell: pwsh
-#      run: dotnet run/build.dll --target=DockerBuildDeps --dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub --push_images=${{env.PUSH_IMAGES}}
+#      run: dotnet run/build.dll --target=DockerBuildDeps --dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
 
     -
       name: Login to GitHub Container Registry
@@ -98,4 +98,4 @@ jobs:
     -
       name: '[Build Docker images]'
       shell: pwsh
-      run: dotnet run/build.dll --target=DockerBuildDeps --dotnet_distro=${{ matrix.distro }} --docker_registry=github --push_images=${{env.PUSH_IMAGES}}
+      run: dotnet run/build.dll --target=DockerBuildDeps --dotnet_distro=${{ matrix.distro }} --docker_registry=github --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic

build/build/Tasks/DockerBaseTask.cs

@@ -1,16 +1,16 @@
-namespace Build;
+using Cake.Common.IO;
+
+namespace Build;
 
 public abstract class DockerBaseTask : FrostingTask<BuildContext>
 {
     protected virtual void DockerImage(BuildContext context, DockerDepsImage dockerImage)
     {
-        var buildSettings = GetBuildSettings(dockerImage, context.DockerRegistry);
+        var tarPath = context.MakeAbsolute(FilePath.FromString("./dest.tar")).FullPath;
+        var buildSettings = GetBuildSettings(dockerImage, context.DockerRegistry, tarPath);
 
         context.DockerBuildXBuild(buildSettings, GetWorkingDir(dockerImage).ToString(), "--annotation \"org.opencontainers.image.description=GitTools build images\"");
-        context.DockerLoad(new()
-        {
-            Input =  new FilePath("./dest.tar").FullPath,
-        });
+        context.DockerLoad(new() { Input =  tarPath });
         var dockerTags = GetDockerTags(dockerImage, context.DockerRegistry, dockerImage.Architecture).ToArray();
 
         if (!context.PushImages)
@@ -39,7 +39,7 @@ protected void DockerManifest(BuildContext context, DockerDepsImage dockerImage)
         }
     }
 
-    protected virtual DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage dockerImage, string registry)
+    protected virtual DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage dockerImage, string registry, string tarPath)
     {
         var arch = dockerImage.Architecture;
         var suffix = arch.ToSuffix();
@@ -49,7 +49,7 @@ protected virtual DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage doc
             Rm = true,
             Tag = dockerTags,
             Platform = [$"linux/{suffix}"],
-            Output = ["type=oci,dest=./dest.tar"],
+            Output = [$"type=oci,dest={tarPath}"],
             Pull = true,
             NoCache = true,
             /*Label =

build/build/Tasks/DockerBuild.cs

@@ -32,9 +32,9 @@ protected override void DockerImage(BuildContext context, DockerDepsImage docker
     protected override DirectoryPath GetWorkingDir(DockerDepsImage dockerImage) =>
         DirectoryPath.FromString("./src/linux");
 
-    protected override DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage dockerImage, string registry)
+    protected override DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage dockerImage, string registry, string tarPath)
     {
-        var buildSettings = base.GetBuildSettings(dockerImage, registry);
+        var buildSettings = base.GetBuildSettings(dockerImage, registry, tarPath);
 
         var workDir = GetWorkingDir(dockerImage);
 

build/build/Tasks/DockerBuildDeps.cs

@@ -26,9 +26,9 @@ public override void Run(BuildContext context)
     protected override DirectoryPath GetWorkingDir(DockerDepsImage dockerImage) =>
         DirectoryPath.FromString($"./src/linux/{dockerImage.Distro}");
 
-    protected override DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage dockerImage, string registry)
+    protected override DockerBuildXBuildSettings GetBuildSettings(DockerDepsImage dockerImage, string registry, string tarPath)
     {
-        var buildSettings = base.GetBuildSettings(dockerImage, registry);
+        var buildSettings = base.GetBuildSettings(dockerImage, registry, tarPath);
         var (distro, arch) = dockerImage;
 
         var workDir = GetWorkingDir(dockerImage);