Support images in the form of "dir:", in build-iso

Signed-off-by: Dimitris Karakasilis <dimitris@karakasilis.me>

Author: jimmykarily

deployer/register.go

@@ -43,7 +43,7 @@ func RegisterAll(d *Deployer) error {
 		d.StepPrepNetbootDir,
 		d.StepPrepISODir,
 		d.StepCopyCloudConfig,
-		d.StepPullContainer,
+		d.StepDumpSource,
 		d.StepGenISO,
 		d.StepExtractNetboot,
 		//TODO: add Validate step

deployer/steps.go

@@ -40,11 +40,11 @@ func (d *Deployer) StepCopyCloudConfig() error {
 		}))
 }
 
-func (d *Deployer) StepPullContainer() error {
+func (d *Deployer) StepDumpSource() error {
 	// Ops to generate from container image
 	return d.Add(opContainerPull,
 		herd.EnableIf(d.fromImage),
-		herd.WithDeps(opPreparetmproot), herd.WithCallback(ops.PullContainerImage(d.containerImage(), d.tmpRootFs())))
+		herd.WithDeps(opPreparetmproot), herd.WithCallback(ops.DumpSource(d.containerImage(), d.tmpRootFs())))
 }
 
 func (d *Deployer) StepGenISO() error {

go.mod

@@ -9,7 +9,6 @@ godebug x509negativeserial=1
 require (
 	github.com/cavaliergopher/grab/v3 v3.0.1
 	github.com/containerd/containerd v1.7.23
-	github.com/distribution/reference v0.6.0
 	github.com/foxboron/go-uefi v0.0.0-20241017190036-fab4fdf2f2f3
 	github.com/foxboron/sbctl v0.0.0-20240526163235-64e649b31c8e
 	github.com/gofrs/uuid v4.4.0+incompatible
@@ -71,6 +70,7 @@ require (
 	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
 	github.com/denisbrodbeck/machineid v1.0.1 // indirect
 	github.com/diskfs/go-diskfs v1.4.2 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
 	github.com/djherbis/times v1.6.0 // indirect
 	github.com/docker/cli v27.1.1+incompatible // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect

internal/cmd/build-iso.go

@@ -113,7 +113,7 @@ var BuildISOCmd = cli.Command{
 			d.StepPrepTmpRootDir,
 			d.StepPrepISODir,
 			d.StepCopyCloudConfig,
-			d.StepPullContainer,
+			d.StepDumpSource,
 			d.StepGenISO,
 		} {
 			if err := step(); err != nil {

pkg/ops/container.go

@@ -3,37 +3,32 @@ package ops
 import (
 	"context"
 	"fmt"
-	"os"
 
-	"github.com/distribution/reference"
-	"github.com/kairos-io/AuroraBoot/internal"
-	sdkUtils "github.com/kairos-io/kairos-sdk/utils"
+	"github.com/kairos-io/kairos-agent/v2/pkg/elemental"
+	v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1"
+	sdkTypes "github.com/kairos-io/kairos-sdk/types"
 )
 
-// PullContainerImage pulls a container image either remotely or locally from a docker daemon.
-func PullContainerImage(image, dst string) func(ctx context.Context) error {
+// DumpSource pulls a container image either remotely or locally from a docker daemon
+// or simply copies the directory to the destination.
+// Supports these prefixes:
+// https://github.com/kairos-io/kairos-agent/blob/1e81cdef38677c8a36cae50d3334559976f66481/pkg/types/v1/common.go#L30-L33
+func DumpSource(image, dst string) func(ctx context.Context) error {
 	return func(ctx context.Context) error {
-		_, err := reference.ParseNormalizedNamed(image)
-		if err != nil {
-			return fmt.Errorf("invalid image reference %s", image)
-		}
+		cfg := NewConfig(
+			WithImageExtractor(v1.OCIImageExtractor{}),
+			WithLogger(sdkTypes.NewKairosLogger("auroraboot-dump-source", "debug", false)),
+		)
+		e := elemental.NewElemental(cfg)
 
-		img, err := sdkUtils.GetImage(image, "", nil, nil)
+		imgSource, err := v1.NewSrcFromURI(image)
 		if err != nil {
-			internal.Log.Logger.Error().Err(err).Str("image", image).Msg("failed to pull image")
 			return err
 		}
-		internal.Log.Logger.Info().Msgf("Pulling container image '%s' to '%s')", image, dst)
-
-		// This method already first tries the local registry and then moves to remote, so no need to pass local
-		err = os.MkdirAll(dst, os.ModeDir|os.ModePerm)
-		if err != nil {
-			internal.Log.Logger.Error().Err(err).Str("image", image).Msg("failed to create directory")
+		if _, err := e.DumpSource(dst, imgSource); err != nil {
+			return fmt.Errorf("dumping the source image %s: %w", image, err)
 		}
-		err = sdkUtils.ExtractOCIImage(img, dst)
-		if err != nil {
-			internal.Log.Logger.Error().Err(err).Str("image", image).Msg("failed to extract OCI image")
-		}
-		return err
+
+		return nil
 	}
 }