Minimal image builds

cmd/build/main.go

@@ -67,6 +67,7 @@ type crBlueprint struct {
 	Containers     []blueprint.Container     `json:"containers,omitempty"`
 	Customizations *blueprint.Customizations `json:"customizations,omitempty"`
 	Distro         string                    `json:"distro,omitempty"`
+	Minimal        bool                      `json:"minimal,omitempty"`
 }
 
 type BuildConfig struct {

cmd/gen-manifests/main.go

@@ -73,6 +73,7 @@ type crBlueprint struct {
 	Containers     []blueprint.Container     `json:"containers,omitempty"`
 	Customizations *blueprint.Customizations `json:"customizations,omitempty"`
 	Distro         string                    `json:"distro,omitempty"`
+	Minimal        bool                      `json:"minimal,omitempty"`
 }
 
 type buildRequest struct {

internal/environment/azure.go

@@ -5,9 +5,18 @@ type Azure struct {
 }
 
 func (p *Azure) GetPackages() []string {
-	return []string{"WALinuxAgent"}
+	return []string{
+		"cloud-init",
+		"WALinuxAgent",
+	}
 }
 
 func (p *Azure) GetServices() []string {
-	return []string{"waagent"}
+	return []string{
+		"cloud-init.service",
+		"cloud-config.service",
+		"cloud-final.service",
+		"cloud-init-local.service",
+		"waagent",
+	}
 }

internal/environment/ec2.go

@@ -9,5 +9,10 @@ func (p *EC2) GetPackages() []string {
 }
 
 func (p *EC2) GetServices() []string {
-	return []string{"cloud-init.service"}
+	return []string{
+		"cloud-init.service",
+		"cloud-config.service",
+		"cloud-final.service",
+		"cloud-init-local.service",
+	}
 }

internal/environment/kvm.go

@@ -0,0 +1,21 @@
+package environment
+
+type KVM struct {
+	BaseEnvironment
+}
+
+func (e *KVM) GetPackages() []string {
+	return []string{
+		"cloud-init",
+		"qemu-guest-agent",
+	}
+}
+
+func (e *KVM) GetServices() []string {
+	return []string{
+		"cloud-init.service",
+		"cloud-config.service",
+		"cloud-final.service",
+		"cloud-init-local.service",
+	}
+}

pkg/blueprint/blueprint.go

@@ -12,14 +12,9 @@ type Blueprint struct {
 	Containers     []Container     `json:"containers,omitempty" toml:"containers,omitempty"`
 	Customizations *Customizations `json:"customizations,omitempty" toml:"customizations"`
 	Distro         string          `json:"distro" toml:"distro"`
-}
 
-type Change struct {
-	Commit    string    `json:"commit" toml:"commit"`
-	Message   string    `json:"message" toml:"message"`
-	Revision  *int      `json:"revision" toml:"revision"`
-	Timestamp string    `json:"timestamp" toml:"timestamp"`
-	Blueprint Blueprint `json:"-" toml:"-"`
+	// EXPERIMENTAL
+	Minimal bool `json:"minimal" toml:"minimal"`
 }
 
 // A Package specifies an RPM package.

pkg/distro/fedora/distro.go

@@ -233,20 +233,15 @@ var (
 	}
 
 	qcow2ImgType = imageType{
-		name:     "qcow2",
-		filename: "disk.qcow2",
-		mimeType: "application/x-qemu-disk",
+		name:        "qcow2",
+		filename:    "disk.qcow2",
+		mimeType:    "application/x-qemu-disk",
+		environment: &environment.KVM{},
 		packageSets: map[string]packageSetFunc{
 			osPkgsKey: qcow2CommonPackageSet,
 		},
 		defaultImageConfig: &distro.ImageConfig{
 			DefaultTarget: common.ToPtr("multi-user.target"),
-			EnabledServices: []string{
-				"cloud-init.service",
-				"cloud-config.service",
-				"cloud-final.service",
-				"cloud-init-local.service",
-			},
 		},
 		kernelOptions:       cloudKernelOptions,
 		bootable:            true,

pkg/distro/fedora/images.go

@@ -235,20 +235,24 @@ func osCustomizations(
 
 func diskImage(workload workload.Workload,
 	t *imageType,
-	customizations *blueprint.Customizations,
+	bp *blueprint.Blueprint,
 	options distro.ImageOptions,
 	packageSets map[string]rpmmd.PackageSet,
 	containers []container.SourceSpec,
 	rng *rand.Rand) (image.ImageKind, error) {
 
 	img := image.NewDiskImage()
 	img.Platform = t.platform
-	img.OSCustomizations = osCustomizations(t, packageSets[osPkgsKey], containers, customizations)
+	img.OSCustomizations = osCustomizations(t, packageSets[osPkgsKey], containers, bp.Customizations)
 	img.Environment = t.environment
 	img.Workload = workload
 	img.Compression = t.compression
+	if bp.Minimal {
+		// Disable weak dependencies if the 'minimal' option is enabled
+		img.InstallWeakDeps = common.ToPtr(false)
+	}
 	// TODO: move generation into LiveImage
-	pt, err := t.getPartitionTable(customizations.GetFilesystems(), options, rng)
+	pt, err := t.getPartitionTable(bp.Customizations.GetFilesystems(), options, rng)
 	if err != nil {
 		return nil, err
 	}
@@ -261,15 +265,15 @@ func diskImage(workload workload.Workload,
 
 func containerImage(workload workload.Workload,
 	t *imageType,
-	c *blueprint.Customizations,
+	bp *blueprint.Blueprint,
 	options distro.ImageOptions,
 	packageSets map[string]rpmmd.PackageSet,
 	containers []container.SourceSpec,
 	rng *rand.Rand) (image.ImageKind, error) {
 	img := image.NewBaseContainer()
 
 	img.Platform = t.platform
-	img.OSCustomizations = osCustomizations(t, packageSets[osPkgsKey], containers, c)
+	img.OSCustomizations = osCustomizations(t, packageSets[osPkgsKey], containers, bp.Customizations)
 	img.Environment = t.environment
 	img.Workload = workload
 
@@ -280,7 +284,7 @@ func containerImage(workload workload.Workload,
 
 func liveInstallerImage(workload workload.Workload,
 	t *imageType,
-	customizations *blueprint.Customizations,
+	bp *blueprint.Blueprint,
 	options distro.ImageOptions,
 	packageSets map[string]rpmmd.PackageSet,
 	containers []container.SourceSpec,
@@ -307,7 +311,7 @@ func liveInstallerImage(workload workload.Workload,
 
 func imageInstallerImage(workload workload.Workload,
 	t *imageType,
-	customizations *blueprint.Customizations,
+	bp *blueprint.Blueprint,
 	options distro.ImageOptions,
 	packageSets map[string]rpmmd.PackageSet,
 	containers []container.SourceSpec,
@@ -327,6 +331,7 @@ func imageInstallerImage(workload workload.Workload,
 	}
 	img.AdditionalAnacondaModules = append(img.AdditionalAnacondaModules, "org.fedoraproject.Anaconda.Modules.Users")
 
+	customizations := bp.Customizations
 	img.Platform = t.platform
 	img.Workload = workload
 	img.OSCustomizations = osCustomizations(t, packageSets[osPkgsKey], containers, customizations)
@@ -351,7 +356,7 @@ func imageInstallerImage(workload workload.Workload,
 
 func iotCommitImage(workload workload.Workload,
 	t *imageType,
-	customizations *blueprint.Customizations,
+	bp *blueprint.Blueprint,
 	options distro.ImageOptions,
 	packageSets map[string]rpmmd.PackageSet,
 	containers []container.SourceSpec,
@@ -363,7 +368,7 @@ func iotCommitImage(workload workload.Workload,
 	d := t.arch.distro
 
 	img.Platform = t.platform
-	img.OSCustomizations = osCustomizations(t, packageSets[osPkgsKey], containers, customizations)
+	img.OSCustomizations = osCustomizations(t, packageSets[osPkgsKey], containers, bp.Customizations)
 	if !common.VersionLessThan(d.Releasever(), "38") {
 		// see https://github.com/ostreedev/ostree/issues/2840
 		img.OSCustomizations.Presets = []osbuild.Preset{
@@ -393,7 +398,7 @@ func iotCommitImage(workload workload.Workload,
 
 func iotContainerImage(workload workload.Workload,
 	t *imageType,
-	customizations *blueprint.Customizations,
+	bp *blueprint.Blueprint,
 	options distro.ImageOptions,
 	packageSets map[string]rpmmd.PackageSet,
 	containers []container.SourceSpec,
@@ -403,7 +408,7 @@ func iotContainerImage(workload workload.Workload,
 	img := image.NewOSTreeContainer(commitRef)
 	d := t.arch.distro
 	img.Platform = t.platform
-	img.OSCustomizations = osCustomizations(t, packageSets[osPkgsKey], containers, customizations)
+	img.OSCustomizations = osCustomizations(t, packageSets[osPkgsKey], containers, bp.Customizations)
 	if !common.VersionLessThan(d.Releasever(), "38") {
 		// see https://github.com/ostreedev/ostree/issues/2840
 		img.OSCustomizations.Presets = []osbuild.Preset{
@@ -434,7 +439,7 @@ func iotContainerImage(workload workload.Workload,
 
 func iotInstallerImage(workload workload.Workload,
 	t *imageType,
-	customizations *blueprint.Customizations,
+	bp *blueprint.Blueprint,
 	options distro.ImageOptions,
 	packageSets map[string]rpmmd.PackageSet,
 	containers []container.SourceSpec,
@@ -449,6 +454,7 @@ func iotInstallerImage(workload workload.Workload,
 
 	img := image.NewAnacondaOSTreeInstaller(commit)
 
+	customizations := bp.Customizations
 	img.Platform = t.platform
 	img.ExtraBasePackages = packageSets[installerPkgsKey]
 	img.Users = users.UsersFromBP(customizations.GetUsers())
@@ -475,7 +481,7 @@ func iotInstallerImage(workload workload.Workload,
 
 func iotImage(workload workload.Workload,
 	t *imageType,
-	customizations *blueprint.Customizations,
+	bp *blueprint.Blueprint,
 	options distro.ImageOptions,
 	packageSets map[string]rpmmd.PackageSet,
 	containers []container.SourceSpec,
@@ -489,6 +495,7 @@ func iotImage(workload workload.Workload,
 
 	distro := t.Arch().Distro()
 
+	customizations := bp.Customizations
 	img.Users = users.UsersFromBP(customizations.GetUsers())
 	img.Groups = users.GroupsFromBP(customizations.GetGroups())
 
@@ -551,7 +558,7 @@ func iotImage(workload workload.Workload,
 
 func iotSimplifiedInstallerImage(workload workload.Workload,
 	t *imageType,
-	customizations *blueprint.Customizations,
+	bp *blueprint.Blueprint,
 	options distro.ImageOptions,
 	packageSets map[string]rpmmd.PackageSet,
 	containers []container.SourceSpec,
@@ -563,6 +570,7 @@ func iotSimplifiedInstallerImage(workload workload.Workload,
 	}
 	rawImg := image.NewOSTreeDiskImage(commit)
 
+	customizations := bp.Customizations
 	rawImg.Users = users.UsersFromBP(customizations.GetUsers())
 	rawImg.Groups = users.GroupsFromBP(customizations.GetGroups())
 

pkg/distro/fedora/imagetype.go

@@ -21,7 +21,7 @@ import (
 	"golang.org/x/exp/slices"
 )
 
-type imageFunc func(workload workload.Workload, t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, packageSets map[string]rpmmd.PackageSet, containers []container.SourceSpec, rng *rand.Rand) (image.ImageKind, error)
+type imageFunc func(workload workload.Workload, t *imageType, bp *blueprint.Blueprint, options distro.ImageOptions, packageSets map[string]rpmmd.PackageSet, containers []container.SourceSpec, rng *rand.Rand) (image.ImageKind, error)
 
 type packageSetFunc func(t *imageType) rpmmd.PackageSet
 
@@ -174,8 +174,11 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 	// of the same name from the distro and arch
 	staticPackageSets := make(map[string]rpmmd.PackageSet)
 
-	for name, getter := range t.packageSets {
-		staticPackageSets[name] = getter(t)
+	// don't add any static packages if Minimal was selected
+	if !bp.Minimal {
+		for name, getter := range t.packageSets {
+			staticPackageSets[name] = getter(t)
+		}
 	}
 
 	// amend with repository information and collect payload repos
@@ -219,7 +222,7 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 	/* #nosec G404 */
 	rng := rand.New(source)
 
-	img, err := t.image(w, t, bp.Customizations, options, staticPackageSets, containerSources, rng)
+	img, err := t.image(w, t, bp, options, staticPackageSets, containerSources, rng)
 	if err != nil {
 		return nil, nil, err
 	}

pkg/image/disk.go

@@ -32,6 +32,10 @@ type DiskImage struct {
 	OSProduct string
 	OSVersion string
 	OSNick    string
+
+	// InstallWeakDeps enables installation of weak dependencies for packages
+	// that are statically defined for the payload pipeline of the image.
+	InstallWeakDeps *bool
 }
 
 func NewDiskImage() *DiskImage {
@@ -57,6 +61,9 @@ func (img *DiskImage) InstantiateManifest(m *manifest.Manifest,
 	osPipeline.OSProduct = img.OSProduct
 	osPipeline.OSVersion = img.OSVersion
 	osPipeline.OSNick = img.OSNick
+	if img.InstallWeakDeps != nil {
+		osPipeline.InstallWeakDeps = *img.InstallWeakDeps
+	}
 
 	rawImagePipeline := manifest.NewRawImage(buildPipeline, osPipeline)
 	rawImagePipeline.PartTool = img.PartTool

pkg/manifest/os.go

@@ -167,6 +167,9 @@ type OS struct {
 	OSVersion string
 	OSNick    string
 
+	// InstallWeakDeps enables installation of weak dependencies for packages
+	// that are statically defined for the pipeline.
+	// Defaults to True.
 	InstallWeakDeps bool
 }
 

test/config-map.json

@@ -105,5 +105,21 @@
       "centos*",
       "fedora*"
     ]
+  },
+  "./configs/minimal.json": {
+    "image-types": [
+      "qcow2"
+    ],
+    "distros": [
+      "fedora*"
+    ]
+  },
+  "./configs/minimal-pkgs.json": {
+    "image-types": [
+      "qcow2"
+    ],
+    "distros": [
+      "fedora*"
+    ]
   }
 }

test/configs/minimal-pkgs.json

@@ -0,0 +1,14 @@
+{
+  "name": "minimal-pkgs",
+  "blueprint": {
+    "minimal": true,
+    "packages": [
+      {
+        "name": "tmux"
+      },
+      {
+        "name": "vim-enhanced"
+      }
+    ]
+  }
+}

test/configs/minimal.json

@@ -0,0 +1,6 @@
+{
+  "name": "minimal",
+  "blueprint": {
+    "minimal": true
+  }
+}