distro/multi: additional container storage

Enable a custom storage path for containers to be pulled into. Jira: https://issues.redhat.com/browse/HMS-3235
osbuild · Jan 5, 2024 · 9c72009 · 9c72009
1 parent 30d49a4
commit 9c72009
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git a/pkg/distro/fedora/images.go b/pkg/distro/fedora/images.go
@@ -147,6 +147,10 @@ func osCustomizations(
 		osc.ContainersStorage = &storagePath
 	}
 
+	if containerStorage := c.GetContainerStorage(); containerStorage != nil {
+		osc.ContainersStorage = containerStorage.StoragePath
+	}
+
 	customRepos, err := c.GetRepositories()
 	if err != nil {
 		// This shouldn't happen and since the repos

diff --git a/pkg/distro/fedora/imagetype.go b/pkg/distro/fedora/imagetype.go
@@ -256,6 +256,14 @@ func (t *imageType) checkOptions(bp *blueprint.Blueprint, options distro.ImageOp
 		return nil, fmt.Errorf("embedding containers is not supported for %s on %s", t.name, t.arch.distro.name)
 	}
 
+	if len(bp.Containers) > 0 {
+		for _, container := range bp.Containers {
+			if err := container.Validate(); err != nil {
+				return nil, err
+			}
+		}
+	}
+
 	if options.OSTree != nil {
 		if err := options.OSTree.Validate(); err != nil {
 			return nil, err

diff --git a/pkg/distro/rhel8/images.go b/pkg/distro/rhel8/images.go
@@ -164,6 +164,10 @@ func osCustomizations(
 		osc.ContainersStorage = &storagePath
 	}
 
+	if containerStorage := c.GetContainerStorage(); containerStorage != nil {
+		osc.ContainersStorage = containerStorage.StoragePath
+	}
+
 	// set yum repos first, so it doesn't get overridden by
 	// imageConfig.YUMRepos
 	osc.YUMRepos = imageConfig.YUMRepos

diff --git a/pkg/distro/rhel8/imagetype.go b/pkg/distro/rhel8/imagetype.go
@@ -290,6 +290,14 @@ func (t *imageType) checkOptions(bp *blueprint.Blueprint, options distro.ImageOp
 		return warnings, fmt.Errorf("embedding containers is not supported for %s on %s", t.name, t.arch.distro.name)
 	}
 
+	if len(bp.Containers) > 0 {
+		for _, container := range bp.Containers {
+			if err := container.Validate(); err != nil {
+				return nil, err
+			}
+		}
+	}
+
 	if options.OSTree != nil {
 		if err := options.OSTree.Validate(); err != nil {
 			return nil, err

diff --git a/pkg/distro/rhel9/images.go b/pkg/distro/rhel9/images.go
@@ -161,6 +161,10 @@ func osCustomizations(
 		osc.ContainersStorage = &storagePath
 	}
 
+	if containerStorage := c.GetContainerStorage(); containerStorage != nil {
+		osc.ContainersStorage = containerStorage.StoragePath
+	}
+
 	// set yum repos first, so it doesn't get overridden by
 	// imageConfig.YUMRepos
 	osc.YUMRepos = imageConfig.YUMRepos

diff --git a/pkg/distro/rhel9/imagetype.go b/pkg/distro/rhel9/imagetype.go
@@ -290,6 +290,14 @@ func (t *imageType) checkOptions(bp *blueprint.Blueprint, options distro.ImageOp
 		return warnings, fmt.Errorf("embedding containers is not supported for %s on %s", t.name, t.arch.distro.name)
 	}
 
+	if len(bp.Containers) > 0 {
+		for _, container := range bp.Containers {
+			if err := container.Validate(); err != nil {
+				return nil, err
+			}
+		}
+	}
+
 	if options.OSTree != nil {
 		if err := options.OSTree.Validate(); err != nil {
 			return nil, err