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

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

Author: jimmykarily

deployer/register.go

@@ -19,7 +19,7 @@ const (
 	opPrepareNetboot   = "prepare-netboot"
 	opStartNetboot     = "start-netboot"
 
-	opContainerPull  = "container-pull"
+	opDumpSource     = "dump-source"
 	opGenISO         = "gen-iso"
 	opPreparetmproot = "prepare-temp"
 	opExtractNetboot = "extract-netboot"
@@ -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,17 +40,17 @@ 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,
+	return d.Add(opDumpSource,
 		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 {
 	return d.Add(opGenISO,
 		herd.EnableIf(func() bool { return d.fromImage() && !d.rawDiskIsSet() && d.Config.Disk.ARM == nil }),
-		herd.WithDeps(opContainerPull, opCopyCloudConfig), herd.WithCallback(ops.GenISO(d.tmpRootFs(), d.destination(), d.Config.ISO)))
+		herd.WithDeps(opDumpSource, opCopyCloudConfig), herd.WithCallback(ops.GenISO(d.tmpRootFs(), d.destination(), d.Config.ISO)))
 }
 
 func (d *Deployer) StepExtractNetboot() error {
@@ -233,7 +233,7 @@ func (d *Deployer) isoOption() bool {
 }
 
 func (d *Deployer) imageOrSquashFS() herd.OpOption {
-	return herd.IfElse(d.fromImage(), herd.WithDeps(opContainerPull), herd.WithDeps(opExtractSquashFS))
+	return herd.IfElse(d.fromImage(), herd.WithDeps(opDumpSource), herd.WithDeps(opExtractSquashFS))
 }
 
 func (d *Deployer) cloudConfigPath() string {

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
 	}
 }

tests/e2e/disks_test.go

@@ -43,7 +43,7 @@ var _ = Describe("Disk image generation", Label("raw-disks"), func() {
 			Expect(out).To(ContainSubstring("gen-raw-disk"), out)
 			Expect(out).To(ContainSubstring("download-squashfs"), out)
 			Expect(out).To(ContainSubstring("extract-squashfs"), out)
-			Expect(out).ToNot(ContainSubstring("container-pull"), out)
+			Expect(out).ToNot(ContainSubstring("dump-source"), out)
 			Expect(err).ToNot(HaveOccurred(), out)
 			_, err = os.Stat(filepath.Join(tempDir, "build/build/disk.raw"))
 			Expect(err).ToNot(HaveOccurred())
@@ -65,7 +65,7 @@ var _ = Describe("Disk image generation", Label("raw-disks"), func() {
 			Expect(out).To(ContainSubstring("gen-raw-disk"), out)
 			Expect(out).To(ContainSubstring("download-squashfs"), out)
 			Expect(out).To(ContainSubstring("extract-squashfs"), out)
-			Expect(out).ToNot(ContainSubstring("container-pull"), out)
+			Expect(out).ToNot(ContainSubstring("dump-source"), out)
 			Expect(err).ToNot(HaveOccurred(), out)
 			_, err = os.Stat(filepath.Join(tempDir, "build/build/disk.raw.gce"))
 			Expect(err).ToNot(HaveOccurred())
@@ -87,7 +87,7 @@ var _ = Describe("Disk image generation", Label("raw-disks"), func() {
 			Expect(out).To(ContainSubstring("gen-raw-disk"), out)
 			Expect(out).To(ContainSubstring("download-squashfs"), out)
 			Expect(out).To(ContainSubstring("extract-squashfs"), out)
-			Expect(out).ToNot(ContainSubstring("container-pull"), out)
+			Expect(out).ToNot(ContainSubstring("dump-source"), out)
 			Expect(err).ToNot(HaveOccurred(), out)
 			_, err = os.Stat(filepath.Join(tempDir, "build/build/disk.raw.vhd"))
 			Expect(err).ToNot(HaveOccurred())
@@ -109,7 +109,7 @@ var _ = Describe("Disk image generation", Label("raw-disks"), func() {
 		// 	Expect(out).To(ContainSubstring("gen-raw-mbr-disk"), out)
 		// 	Expect(out).To(ContainSubstring("download-squashfs"), out)
 		// 	Expect(out).To(ContainSubstring("extract-squashfs"), out)
-		// 	Expect(out).ToNot(ContainSubstring("container-pull"), out)
+		// 	Expect(out).ToNot(ContainSubstring("dump-source"), out)
 		// 	Expect(err).ToNot(HaveOccurred(), out)
 		// 	_, err = os.Stat(filepath.Join(tempDir, "build/build/disk.raw.gce"))
 		// 	Expect(err).ToNot(HaveOccurred())
@@ -184,7 +184,7 @@ stages:
 			Expect(out).To(ContainSubstring("Generating raw disk"), out)
 			Expect(out).ToNot(ContainSubstring("build-arm-image"), out)
 			Expect(out).To(ContainSubstring("gen-raw-disk"), out)
-			Expect(out).To(ContainSubstring("container-pull"), out)
+			Expect(out).To(ContainSubstring("dump-source"), out)
 			Expect(err).ToNot(HaveOccurred(), out)
 			_, err = os.Stat(filepath.Join(tempDir, "build/build/disk.raw"))
 			Expect(err).ToNot(HaveOccurred())
@@ -205,7 +205,7 @@ stages:
 			Expect(out).ToNot(ContainSubstring("build-arm-image"), out)
 			Expect(out).To(ContainSubstring("gen-raw-disk"), out)
 			Expect(out).To(ContainSubstring("convert-gce"), out)
-			Expect(out).To(ContainSubstring("container-pull"), out)
+			Expect(out).To(ContainSubstring("dump-source"), out)
 			Expect(err).ToNot(HaveOccurred(), out)
 			_, err = os.Stat(filepath.Join(tempDir, "build/build/disk.raw.gce"))
 			Expect(err).ToNot(HaveOccurred())
@@ -226,7 +226,7 @@ stages:
 			Expect(out).ToNot(ContainSubstring("build-arm-image"), out)
 			Expect(out).To(ContainSubstring("gen-raw-disk"), out)
 			Expect(out).To(ContainSubstring("convert-vhd"), out)
-			Expect(out).To(ContainSubstring("container-pull"), out)
+			Expect(out).To(ContainSubstring("dump-source"), out)
 			Expect(err).ToNot(HaveOccurred(), out)
 			_, err = os.Stat(filepath.Join(tempDir, "build/build/disk.raw.vhd"))
 			Expect(err).ToNot(HaveOccurred())
@@ -247,7 +247,7 @@ stages:
 			Expect(out).To(ContainSubstring("Generating MBR disk"), out)
 			Expect(out).ToNot(ContainSubstring("build-arm-image"), out)
 			Expect(out).To(ContainSubstring("gen-raw-mbr-disk"), out)
-			Expect(out).To(ContainSubstring("container-pull"), out)
+			Expect(out).To(ContainSubstring("dump-source"), out)
 			Expect(err).ToNot(HaveOccurred(), out)
 			_, err = os.Stat(filepath.Join(tempDir, "build/build/disk.raw"))
 			Expect(err).ToNot(HaveOccurred())

tests/e2e/iso_test.go

@@ -45,14 +45,16 @@ var _ = Describe("ISO image generation", Label("iso"), func() {
 		})
 
 		It("fails if cloud config is empty", func() {
+			image := "quay.io/kairos/core-rockylinux:latest"
+
 			err := WriteConfig("", tempDir)
 			Expect(err).ToNot(HaveOccurred())
 
-			out, err := RunAurora(fmt.Sprintf(`--set container_image=quay.io/kairos/core-rockylinux:latest \
+			out, err := RunAurora(fmt.Sprintf(`--set container_image=oci://%s \
 			--set "disable_http_server=true" \
 			--set "disable_netboot=true" \
 			--cloud-config /config.yaml \
-			--set "state_dir=/tmp/auroraboot"`), tempDir)
+			--set "state_dir=/tmp/auroraboot"`, image), tempDir)
 			Expect(err).To(HaveOccurred(), out)
 			Expect(out).To(MatchRegexp("cloud config set but contents are empty"))
 		})