Add filtering for environment variables and LXC target configs

distrobuilder/main.go

@@ -342,7 +342,7 @@ func (c *cmdGlobal) preRunBuild(cmd *cobra.Command, args []string) error {
 	}
 
 	// Setup the mounts and chroot into the rootfs
-	exitChroot, err := shared.SetupChroot(c.sourceDir, c.definition.Environment, nil)
+	exitChroot, err := shared.SetupChroot(c.sourceDir, *c.definition, nil)
 	if err != nil {
 		return fmt.Errorf("Failed to setup chroot: %w", err)
 	}

distrobuilder/main_build-dir.go

@@ -49,7 +49,7 @@ func (c *cmdBuildDir) command() *cobra.Command {
 			}
 
 			exitChroot, err := shared.SetupChroot(c.global.targetDir,
-				c.global.definition.Environment, nil)
+				*c.global.definition, nil)
 			if err != nil {
 				return fmt.Errorf("Failed to setup chroot in %q: %w", c.global.targetDir, err)
 			}

distrobuilder/main_lxc.go

@@ -114,7 +114,7 @@ func (c *cmdLXC) commandPack() *cobra.Command {
 
 func (c *cmdLXC) runPack(cmd *cobra.Command, args []string, overlayDir string) error {
 	// Setup the mounts and chroot into the rootfs
-	exitChroot, err := shared.SetupChroot(overlayDir, c.global.definition.Environment, nil)
+	exitChroot, err := shared.SetupChroot(overlayDir, *c.global.definition, nil)
 	if err != nil {
 		return fmt.Errorf("Failed to setup chroot: %w", err)
 	}
@@ -207,7 +207,7 @@ func (c *cmdLXC) run(cmd *cobra.Command, args []string, overlayDir string) error
 	}
 
 	exitChroot, err := shared.SetupChroot(overlayDir,
-		c.global.definition.Environment, nil)
+		*c.global.definition, nil)
 	if err != nil {
 		return fmt.Errorf("Failed to setup chroot in %q: %w", overlayDir, err)
 	}

distrobuilder/main_lxd.go

@@ -179,7 +179,7 @@ func (c *cmdLXD) commandPack() *cobra.Command {
 
 func (c *cmdLXD) runPack(cmd *cobra.Command, args []string, overlayDir string) error {
 	// Setup the mounts and chroot into the rootfs
-	exitChroot, err := shared.SetupChroot(overlayDir, c.global.definition.Environment, nil)
+	exitChroot, err := shared.SetupChroot(overlayDir, *c.global.definition, nil)
 	if err != nil {
 		return fmt.Errorf("Failed to setup chroot: %w", err)
 	}
@@ -388,7 +388,7 @@ func (c *cmdLXD) run(cmd *cobra.Command, args []string, overlayDir string) error
 	}
 
 	exitChroot, err := shared.SetupChroot(rootfsDir,
-		c.global.definition.Environment, mounts)
+		*c.global.definition, mounts)
 	if err != nil {
 		return fmt.Errorf("Failed to chroot: %w", err)
 	}

image/lxc.go

@@ -86,7 +86,13 @@ func (l *LXCImage) Build(compression string) error {
 func (l *LXCImage) createMetadata() error {
 	metaDir := filepath.Join(l.cacheDir, "metadata")
 
+	imageTargets := shared.ImageTargetUndefined | shared.ImageTargetContainer | shared.ImageTargetAll
+
 	for _, c := range l.definition.Targets.LXC.Config {
+		if !shared.ApplyFilter(&c, l.definition.Image.Release, l.definition.Image.ArchitectureMapped, l.definition.Image.Variant, l.definition.Targets.Type, imageTargets) {
+			continue
+		}
+
 		// If not specified, create files up to ${maxLXCCompatLevel}
 		if c.Before == 0 {
 			c.Before = maxLXCCompatLevel + 1

shared/chroot.go

@@ -177,7 +177,7 @@ func killChrootProcesses(rootfs string) error {
 }
 
 // SetupChroot sets up mount and files, a reverter and then chroots for you.
-func SetupChroot(rootfs string, envs DefinitionEnv, m []ChrootMount) (func() error, error) {
+func SetupChroot(rootfs string, definition Definition, m []ChrootMount) (func() error, error) {
 	// Mount the rootfs
 	err := unix.Mount(rootfs, rootfs, "", unix.MS_BIND, "")
 	if err != nil {
@@ -248,6 +248,7 @@ func SetupChroot(rootfs string, envs DefinitionEnv, m []ChrootMount) (func() err
 	}
 
 	var env Environment
+	envs := definition.Environment
 
 	if envs.ClearDefaults {
 		env = Environment{}
@@ -273,7 +274,19 @@ func SetupChroot(rootfs string, envs DefinitionEnv, m []ChrootMount) (func() err
 	}
 
 	if envs.EnvVariables != nil && len(envs.EnvVariables) > 0 {
+		imageTargets := ImageTargetUndefined | ImageTargetAll
+
+		if definition.Targets.Type == DefinitionFilterTypeContainer {
+			imageTargets |= ImageTargetContainer
+		} else if definition.Targets.Type == DefinitionFilterTypeVM {
+			imageTargets |= ImageTargetVM
+		}
+
 		for _, e := range envs.EnvVariables {
+			if !ApplyFilter(&e, definition.Image.Release, definition.Image.ArchitectureMapped, definition.Image.Variant, definition.Targets.Type, imageTargets) {
+				continue
+			}
+
 			entry, ok := env[e.Key]
 			if ok {
 				entry.Value = e.Value

shared/definition.go

@@ -171,10 +171,11 @@ type DefinitionSource struct {
 
 // A DefinitionTargetLXCConfig represents the config part of the metadata.
 type DefinitionTargetLXCConfig struct {
-	Type    string `yaml:"type"`
-	Before  uint   `yaml:"before,omitempty"`
-	After   uint   `yaml:"after,omitempty"`
-	Content string `yaml:"content"`
+	DefinitionFilter `yaml:",inline"`
+	Type             string `yaml:"type"`
+	Before           uint   `yaml:"before,omitempty"`
+	After            uint   `yaml:"after,omitempty"`
+	Content          string `yaml:"content"`
 }
 
 // A DefinitionTargetLXC represents LXC specific files as part of the metadata.
@@ -240,8 +241,9 @@ type DefinitionMappings struct {
 
 // DefinitionEnvVars defines custom environment variables.
 type DefinitionEnvVars struct {
-	Key   string `yaml:"key"`
-	Value string `yaml:"value"`
+	DefinitionFilter `yaml:",inline"`
+	Key              string `yaml:"key"`
+	Value            string `yaml:"value"`
 }
 
 // DefinitionEnv represents the config part of the environment section.

sources/alpine-http.go

@@ -108,7 +108,7 @@ func (s *alpineLinux) Run() error {
 	// Handle edge builds
 	if s.definition.Image.Release == "edge" {
 		// Upgrade to edge
-		exitChroot, err := shared.SetupChroot(s.rootfsDir, s.definition.Environment, nil)
+		exitChroot, err := shared.SetupChroot(s.rootfsDir, s.definition, nil)
 		if err != nil {
 			return fmt.Errorf("Failed to set up chroot: %w", err)
 		}

sources/oraclelinux-http.go

@@ -252,7 +252,7 @@ func (s *oraclelinux) unpackISO(latestUpdate, filePath, rootfsDir string) error
 	}
 
 	// Setup the mounts and chroot into the rootfs
-	exitChroot, err := shared.SetupChroot(tempRootDir, shared.DefinitionEnv{}, nil)
+	exitChroot, err := shared.SetupChroot(tempRootDir, shared.Definition{}, nil)
 	if err != nil {
 		return fmt.Errorf("Failed to setup chroot: %w", err)
 	}

sources/rhel-common.go

@@ -151,7 +151,7 @@ func (c *commonRHEL) unpackISO(filePath, rootfsDir string, scriptRunner func(str
 	}
 
 	// Setup the mounts and chroot into the rootfs
-	exitChroot, err := shared.SetupChroot(tempRootDir, shared.DefinitionEnv{}, nil)
+	exitChroot, err := shared.SetupChroot(tempRootDir, shared.Definition{}, nil)
 	if err != nil {
 		return fmt.Errorf("Failed to setup chroot: %w", err)
 	}
@@ -291,7 +291,7 @@ func (c *commonRHEL) unpackRaw(filePath, rootfsDir string, scriptRunner func() e
 	}
 
 	// Setup the mounts and chroot into the rootfs
-	exitChroot, err := shared.SetupChroot(tempRootDir, shared.DefinitionEnv{}, nil)
+	exitChroot, err := shared.SetupChroot(tempRootDir, shared.Definition{}, nil)
 	if err != nil {
 		return fmt.Errorf("Failed to setup chroot: %w", err)
 	}