Add support to build product hook.

Now if an hook is defined it's used build-dir and pack-*.

Author: Daniele Rondina

cmd/root.go

@@ -38,13 +38,12 @@ Copyright (c) 2019 Mottainai
 
 Mottainai - LXC/LXD Simplestreams Tree Builder`
 
-	SSB_ENV_PREFIX = `SSBUILDER`
-	SSB_VERSION    = `0.1.0`
+	SSB_VERSION = `0.1.0`
 )
 
 func initConfig(config *conf.BuilderTreeConfig) {
 	// Set env variable
-	config.Viper.SetEnvPrefix(SSB_ENV_PREFIX)
+	config.Viper.SetEnvPrefix(conf.SSB_ENV_PREFIX)
 	config.Viper.BindEnv("config")
 	config.Viper.SetDefault("config", "")
 

contrib/config/tree.example.yml

@@ -30,6 +30,7 @@ products:
     # this option is not needed.
     #prefix_path: "http://my.mottainai.org/namespace/lxd-sabayon-builder"
 
+    days: 1
     aliases:
       - "sabayon/builder"
 
@@ -39,6 +40,12 @@ products:
     release: current
     os: Sabayon
     directory: sbi/sabayon-base
+    # Currently distrobuilder doesn't implement a generator for inject
+    # files from host before enter on chroot. In additional, for
+    # oraclelinux it seems that .distrobuilder is not cleaned correctly.
+    # If it's defined a script then instead of call build-lxc and build-lxc
+    # I split creation in two steps: build-dir + script + pack-lxc|pack-lxd
+    # build_script_hook: "/myscript.sh"
     #hidden: true
     # Define number of images maintains for the product. Default is 1 day/image.
     #days: 1

pkg/config/config.go

@@ -27,6 +27,10 @@ import (
 	v "github.com/spf13/viper"
 )
 
+const (
+	SSB_ENV_PREFIX = `SSBUILDER`
+)
+
 type SimpleStreamsProduct struct {
 	Name            string   `mapstructure:"name"`
 	Architecture    string   `mapstructure:"arch"`
@@ -36,6 +40,7 @@ type SimpleStreamsProduct struct {
 	Directory       string   `mapstructure:"directory"`
 	Version         string   `mapstructure:"version"`
 	PrefixPath      string   `mapstructure:"prefix_path"`
+	BuildScriptHook string   `mapstructure:"build_script_hook"`
 	Aliases         []string `mapstructure:"aliases"`
 	Hidden          bool     `mapstructure:"hidden"`
 	Days            int      `mapstructure:"days"`
@@ -126,11 +131,12 @@ func (p *SimpleStreamsProduct) String() string {
 	prefix_path: %s
 	hidden: %v
 	days: %d
+	build_script_hook: %s
 	aliases: %s`,
 		p.Name, p.Architecture, p.Release,
 		p.ReleaseTitle, p.OperatingSystem,
 		p.Directory, p.Version, p.PrefixPath,
-		p.Hidden, p.Days, p.Aliases)
+		p.Hidden, p.Days, p.BuildScriptHook, p.Aliases)
 
 	return ans
 }

pkg/images/product.go

@@ -35,16 +35,18 @@ import (
 )
 
 type BuildProductOpts struct {
-	BuildLxc       bool
-	BuildLxd       bool
-	PurgeOldImages bool
+	BuildLxc        bool
+	BuildLxd        bool
+	PurgeOldImages  bool
+	BuildScriptHook string
 }
 
 func NewBuildProductOpts() *BuildProductOpts {
 	return &BuildProductOpts{
-		BuildLxc:       true,
-		BuildLxd:       true,
-		PurgeOldImages: true,
+		BuildLxc:        true,
+		BuildLxd:        true,
+		PurgeOldImages:  true,
+		BuildScriptHook: "",
 	}
 }
 
@@ -110,39 +112,84 @@ func BuildProduct(product *config.SimpleStreamsProduct, targetDir, imageFile str
 			dateDir, product.Name))
 	}
 
-	if opts.BuildLxc {
-		buildLxcCommand := exec.Command("distrobuilder",
-			"build-lxc", imageFile, dateDir,
-			"--cache-dir", cacheDir)
+	if opts.BuildScriptHook != "" {
 
-		// https://blog.kowalczyk.info/article/wOYk/advanced-command-execution-in-go-with-osexec.html
-		buildLxcCommand.Stdout = os.Stdout
-		buildLxcCommand.Stderr = os.Stderr
+		// Create rootfs directory
+		rootfsDir := path.Join(dateDir, "staging")
+		buildDirCommand := exec.Command("distrobuilder",
+			"build-dir", imageFile, rootfsDir,
+			"--cache-dir", cacheDir)
+		defer tools.RemoveDirIfNotExist(rootfsDir)
 
-		err = buildLxcCommand.Run()
+		err = buildDirCommand.Run()
 		if err != nil {
 			return err
 		}
 
-		// Create cache dir cleanup by distrobuilder
-		_, err = tools.MkdirIfNotExist(cacheDir, 0760)
+		runHookCommand := exec.Command(opts.BuildScriptHook)
+		// Prepare env for hook
+		runHookCommand.Env = append(os.Environ(),
+			fmt.Sprintf("%s_STAGING_DIR=%s", config.SSB_ENV_PREFIX, rootfsDir),
+			fmt.Sprintf("%s_BUILD_PRODUCT=%s", config.SSB_ENV_PREFIX, product.Name))
+
+		err = runHookCommand.Run()
 		if err != nil {
 			return err
 		}
-	}
 
-	if opts.BuildLxd {
-		buildLxdCommand := exec.Command("distrobuilder",
-			"build-lxd", imageFile, dateDir,
-			"--cache-dir", cacheDir)
+		// Create LXC package
+		if opts.BuildLxc {
+			err = packImage(imageFile, rootfsDir, dateDir, cacheDir, "pack-lxc")
+			if err != nil {
+				return err
+			}
+		}
 
-		buildLxdCommand.Stdout = os.Stdout
-		buildLxdCommand.Stderr = os.Stderr
+		// Create LXD package
+		if opts.BuildLxd {
+			err = packImage(imageFile, rootfsDir, dateDir, cacheDir, "pack-lxd")
+			if err != nil {
+				return err
+			}
+		}
 
-		err = buildLxdCommand.Run()
-		if err != nil {
-			return err
+	} else {
+
+		if opts.BuildLxc {
+			buildLxcCommand := exec.Command("distrobuilder",
+				"build-lxc", imageFile, dateDir,
+				"--cache-dir", cacheDir)
+
+			// https://blog.kowalczyk.info/article/wOYk/advanced-command-execution-in-go-with-osexec.html
+			buildLxcCommand.Stdout = os.Stdout
+			buildLxcCommand.Stderr = os.Stderr
+
+			err = buildLxcCommand.Run()
+			if err != nil {
+				return err
+			}
+
+			// Create cache dir cleanup by distrobuilder
+			_, err = tools.MkdirIfNotExist(cacheDir, 0760)
+			if err != nil {
+				return err
+			}
 		}
+
+		if opts.BuildLxd {
+			buildLxdCommand := exec.Command("distrobuilder",
+				"build-lxd", imageFile, dateDir,
+				"--cache-dir", cacheDir)
+
+			buildLxdCommand.Stdout = os.Stdout
+			buildLxdCommand.Stderr = os.Stderr
+
+			err = buildLxdCommand.Run()
+			if err != nil {
+				return err
+			}
+		}
+
 	}
 
 	if opts.PurgeOldImages {
@@ -152,6 +199,32 @@ func BuildProduct(product *config.SimpleStreamsProduct, targetDir, imageFile str
 	return nil
 }
 
+func packImage(imageFile, rootfsDir, dateDir, cacheDir, subCommand string) error {
+	var err error
+
+	// Create cache dir cleanup by distrobuilder
+	_, err = tools.MkdirIfNotExist(cacheDir, 0760)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("Executing %s command...\n", subCommand)
+
+	packCommand := exec.Command("distrobuilder",
+		subCommand, imageFile, rootfsDir, dateDir,
+		"--cache-dir", cacheDir)
+
+	packCommand.Stdout = os.Stdout
+	packCommand.Stderr = os.Stderr
+
+	err = packCommand.Run()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func purgeOldImages(productDir string, product *config.SimpleStreamsProduct) error {
 	var err error
 	var files []os.FileInfo

pkg/tools/utils.go

@@ -54,3 +54,17 @@ func MkdirIfNotExist(dir string, mode os.FileMode) (*os.FileInfo, error) {
 		return nil, nil
 	}
 }
+
+func RemoveDirIfNotExist(dir string) error {
+	var err error
+
+	if dir == "" {
+		return fmt.Errorf("Invalid directory")
+	}
+
+	if _, err = os.Stat(dir); os.IsNotExist(err) {
+		return nil
+	}
+
+	return os.RemoveAll(dir)
+}