From 43200ea6342590c6806f808b318d7f3a69b0cdd8 Mon Sep 17 00:00:00 2001
From: Christoph Ostarek <christoph@zededa.com>
Date: Fri, 12 Sep 2025 14:35:53 +0200
Subject: [PATCH] pkglib: untangle WithBuildDocker and DryRun

this makes it possible for a user of this API to
build their own DryRunner

also make newDockerRunner public as well to be consistent

Signed-off-by: Christoph Ostarek <christoph@zededa.com>
---
 src/cmd/linuxkit/pkglib/build.go        | 6 +++---
 src/cmd/linuxkit/pkglib/dockerdryrun.go | 2 +-
 src/cmd/linuxkit/pkglib/dockerimpl.go   | 2 +-
 src/cmd/linuxkit/pkglib/utils.go        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cmd/linuxkit/pkglib/build.go b/src/cmd/linuxkit/pkglib/build.go
index 470076809..f554a4540 100644
--- a/src/cmd/linuxkit/pkglib/build.go
+++ b/src/cmd/linuxkit/pkglib/build.go
@@ -319,10 +319,10 @@ func (p Pkg) Build(bos ...BuildOpt) error {
 
 	d := bo.runner
 	switch {
-	case bo.dryRun:
-		d = newDockerDryRunner()
+	case d == nil && bo.dryRun:
+		d = NewDockerDryRunner()
 	case d == nil:
-		d = newDockerRunner(p.cache)
+		d = NewDockerRunner(p.cache)
 	}
 
 	c := bo.cacheProvider
diff --git a/src/cmd/linuxkit/pkglib/dockerdryrun.go b/src/cmd/linuxkit/pkglib/dockerdryrun.go
index 74248e321..c91186780 100644
--- a/src/cmd/linuxkit/pkglib/dockerdryrun.go
+++ b/src/cmd/linuxkit/pkglib/dockerdryrun.go
@@ -25,7 +25,7 @@ import (
 type dockerDryRunnerImpl struct {
 }
 
-func newDockerDryRunner() DockerRunner {
+func NewDockerDryRunner() DockerRunner {
 	return &dockerDryRunnerImpl{}
 }
 
diff --git a/src/cmd/linuxkit/pkglib/dockerimpl.go b/src/cmd/linuxkit/pkglib/dockerimpl.go
index d7a553738..63a34a005 100644
--- a/src/cmd/linuxkit/pkglib/dockerimpl.go
+++ b/src/cmd/linuxkit/pkglib/dockerimpl.go
@@ -71,7 +71,7 @@ type dockerRunnerImpl struct {
 	cache bool
 }
 
-func newDockerRunner(cache bool) DockerRunner {
+func NewDockerRunner(cache bool) DockerRunner {
 	return &dockerRunnerImpl{cache: cache}
 }
 
diff --git a/src/cmd/linuxkit/pkglib/utils.go b/src/cmd/linuxkit/pkglib/utils.go
index 0af98aa03..9be24882e 100644
--- a/src/cmd/linuxkit/pkglib/utils.go
+++ b/src/cmd/linuxkit/pkglib/utils.go
@@ -98,7 +98,7 @@ func getClientForPlatform(ctx context.Context, buildersMap map[string]string, bu
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse platform: %s", err)
 	}
-	dr := newDockerRunner(false)
+	dr := NewDockerRunner(false)
 	builderName := getBuilderForPlatform(p.Architecture, buildersMap)
 	client, err := dr.Builder(ctx, builderName, builderImage, builderConfigPath, platform, false)
 	if err != nil {