From 4f36386b7a0e1d5faa73218cda5620e09c19fc35 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 6 Nov 2025 11:24:44 +0100 Subject: [PATCH 1/2] go.mod: update to latest ibcli go rev --- bib/go.mod | 2 +- bib/go.sum | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bib/go.mod b/bib/go.mod index 77a942cba..bc1f77587 100644 --- a/bib/go.mod +++ b/bib/go.mod @@ -6,7 +6,7 @@ require ( github.com/cheggaaa/pb/v3 v3.1.7 github.com/hashicorp/go-version v1.7.0 github.com/osbuild/blueprint v1.16.0 - github.com/osbuild/image-builder-cli v0.0.0-20250924085931-15de5139f521 + github.com/osbuild/image-builder-cli v0.0.0-20251117125946-de4e4a0b2c55 github.com/osbuild/images v0.220.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.10.1 diff --git a/bib/go.sum b/bib/go.sum index c5525fc32..ae971c133 100644 --- a/bib/go.sum +++ b/bib/go.sum @@ -247,10 +247,8 @@ github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplU github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U= github.com/osbuild/blueprint v1.16.0 h1:f/kHih+xpeJ1v7wtIfzdHPZTsiXsqKeDQ1+rrue6298= github.com/osbuild/blueprint v1.16.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4= -github.com/osbuild/image-builder-cli v0.0.0-20250924085931-15de5139f521 h1:Mo1htXYyEoKrBQD+/RC/kluAWu4+E0oEjPorujVn/K8= -github.com/osbuild/image-builder-cli v0.0.0-20250924085931-15de5139f521/go.mod h1:oTn9T+bV9g/760hM/jX7AV0c4vuVIn6FjAnaVM9RzRo= -github.com/osbuild/images v0.211.0 h1:3BU7mMM7Iu81qZnq7y8luuIIOt707J9tF9DwCyOk9yM= -github.com/osbuild/images v0.211.0/go.mod h1:Cs7zFV8rmbVHn+19ArNdjd1AtFk+LC9dOOHuxiSLghw= +github.com/osbuild/image-builder-cli v0.0.0-20251117125946-de4e4a0b2c55 h1:qw3ajgOs5vwsyR5PBiWiK6nNeNNG2PsfxEz1Rd25sQg= +github.com/osbuild/image-builder-cli v0.0.0-20251117125946-de4e4a0b2c55/go.mod h1:K44dkohdZinZ5R4MBJcElgjnOdZeVgftW0v7stUEq2E= github.com/osbuild/images v0.220.0 h1:9aeYxhZ8NxbC1E5Zr5NFYWgG0A5euim4gTwUC08/naQ= github.com/osbuild/images v0.220.0/go.mod h1:Cs7zFV8rmbVHn+19ArNdjd1AtFk+LC9dOOHuxiSLghw= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= From d0621055594c829ba40e813e280cb23a5d29b7d1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 6 Nov 2025 11:26:34 +0100 Subject: [PATCH 2/2] bib: drop `inContainerOrUnknown()` and use `setup.IsContainer()` We have a shared helper now in ibcli, lets drop duplicated code. Thanks to Ondrej for writing the new (and better) helper. --- bib/cmd/bootc-image-builder/main.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/bib/cmd/bootc-image-builder/main.go b/bib/cmd/bootc-image-builder/main.go index 603771bf4..42df6248d 100644 --- a/bib/cmd/bootc-image-builder/main.go +++ b/bib/cmd/bootc-image-builder/main.go @@ -8,7 +8,6 @@ import ( "io/fs" "log" "os" - "os/exec" "path/filepath" "runtime/debug" "strconv" @@ -47,16 +46,6 @@ var ( osStderr = os.Stderr ) -func inContainerOrUnknown() bool { - // no systemd-detect-virt, err on the side of container - if _, err := exec.LookPath("systemd-detect-virt"); err != nil { - return true - } - // exit code "0" means the container is detected - err := exec.Command("systemd-detect-virt", "-c", "-q").Run() - return err == nil -} - func saveManifest(ms manifest.OSBuildManifest, fpath string) (err error) { b, err := json.MarshalIndent(ms, "", " ") if err != nil { @@ -280,7 +269,7 @@ func cmdBuild(cmd *cobra.Command, args []string) error { return fmt.Errorf("cannot validate the setup: %w", err) } logrus.Debug("Ensuring environment setup") - switch inContainerOrUnknown() { + switch setup.IsContainer() { case false: fmt.Fprintf(os.Stderr, "WARNING: running outside a container, this is an unsupported configuration\n") case true: