main: add osbuild version to version command

.gitignore

@@ -12,3 +12,4 @@ __pycache__
 *.tar.gz
 *.tar.xz
 *.tar.bz2
+/image-builder

cmd/image-builder/main.go

@@ -479,13 +479,22 @@ image-type and blueprint.
 Image-builder builds operating system images for a range of predefined
 operating systems like Fedora, CentOS and RHEL with easy customizations support.`,
 		SilenceErrors: true,
-		Version:       prettyVersion(),
 		CompletionOptions: cobra.CompletionOptions{
 			HiddenDefaultCmd: true,
 		},
+		Run: func(cmd *cobra.Command, args []string) {
+			// This is not the ideal way to implement this, but cobra does not
+			// support lazy version strings and we need to call "osbuild" subprocess
+			// to get its version.
+			if versionFlag, err := cmd.Flags().GetBool("version"); err == nil && versionFlag {
+				fmt.Print(prettyVersion())
+			} else {
+				cmd.Help()
+			}
+		},
 	}
-	rootCmd.SetVersionTemplate(prettyVersion())
 
+	rootCmd.Flags().Bool("version", false, "Print version information and exit")
 	rootCmd.PersistentFlags().String("data-dir", "", `Override the default data directory for e.g. custom repositories/*.json data`)
 	rootCmd.PersistentFlags().StringArray("extra-repo", nil, `Add an extra repository during build (will *not* be gpg checked and not be part of the final image)`)
 	rootCmd.PersistentFlags().StringArray("force-repo", nil, `Override the base repositories during build (these will not be part of the final image)`)

cmd/image-builder/version.go

@@ -1,13 +1,16 @@
 package main
 
 import (
+	"fmt"
+	"os"
 	"runtime/debug"
 	"strings"
 
+	"github.com/osbuild/images/pkg/osbuild"
 	"gopkg.in/yaml.v3"
 )
 
-// Usually set by whatever is building the binary with a `-x main.version=22`, for example
+// Usually set by whatever is building the binary with a `-X main.version=22`, for example
 // in `make build`.
 var version = "unknown"
 
@@ -16,39 +19,43 @@ type versionDescription struct {
 		Version      string `yaml:"version"`
 		Commit       string `yaml:"commit"`
 		Dependencies struct {
-			Images string `yaml:"images"`
+			Images  string `yaml:"images"`
+			OSBuild string `yaml:"osbuild"`
 		} `yaml:"dependencies"`
 	} `yaml:"image-builder"`
 }
 
-func readVersionFromBinary() *versionDescription {
+func readVersionInfo() *versionDescription {
+	vd := &versionDescription{}
+
 	// We'll be getting these values from the build info if they're available, otherwise
 	// they will always be set to unknown. Note that `version` is set globally so it can
 	// be defined by whatever is building this project.
-	commit := "unknown"
-	images := "unknown"
+	vd.ImageBuilder.Commit = "unknown"
+	vd.ImageBuilder.Version = version
+	vd.ImageBuilder.Dependencies.Images = "unknown"
+	vd.ImageBuilder.Dependencies.OSBuild = "unknown"
 
 	if bi, ok := debug.ReadBuildInfo(); ok {
 		for _, bs := range bi.Settings {
 			switch bs.Key {
 			case "vcs.revision":
-				commit = bs.Value
+				vd.ImageBuilder.Commit = bs.Value
 			}
 		}
 
 		for _, dep := range bi.Deps {
 			if dep.Path == "github.com/osbuild/images" {
-				images = dep.Version
+				vd.ImageBuilder.Dependencies.Images = dep.Version
 			}
 		}
 	}
 
-	vd := &versionDescription{}
-
-	vd.ImageBuilder.Version = version
-	vd.ImageBuilder.Commit = commit
-
-	vd.ImageBuilder.Dependencies.Images = images
+	osbuildVersion, err := osbuild.OSBuildVersion()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to get osbuild version: %v\n", err)
+	}
+	vd.ImageBuilder.Dependencies.OSBuild = osbuildVersion
 
 	return vd
 }
@@ -59,7 +66,7 @@ func prettyVersion() string {
 	enc := yaml.NewEncoder(&b)
 	enc.SetIndent(2)
 
-	enc.Encode(readVersionFromBinary())
+	enc.Encode(readVersionInfo())
 
 	return b.String()
 }

test/test_container.py

@@ -163,6 +163,7 @@ def test_container_version_smoke(build_container):
     assert ver_yaml["image-builder"]["version"] != ""
     assert ver_yaml["image-builder"]["commit"] != ""
     assert ver_yaml["image-builder"]["dependencies"]["images"] != ""
+    assert ver_yaml["image-builder"]["dependencies"]["osbuild"] != ""
 
 
 def test_container_builds_bootc(tmp_path, build_container):