Skip to content

bib: drop inContainerOrUnknown() and use setup.IsContainer() #1111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

bib: drop inContainerOrUnknown() and use setup.IsContainer() #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8fb471
go.mod: update to latest ibcli go rev
mvo5 Nov 6, 2025
0020e85
bib: drop `inContainerOrUnknown()` and use `setup.IsContainer()`
mvo5 Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bib/cmd/bootc-image-builder/legacy_iso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ func manifestForISO(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest, erro

// The ref is not needed and will be removed from the ctor later
// in time
img := image.NewAnacondaContainerInstaller(platform, filename, containerSource, "")
img := image.NewAnacondaContainerInstallerLegacy(platform, filename, containerSource, "")
img.ContainerRemoveSignatures = true
img.RootfsCompression = "zstd"

Expand Down
13 changes: 1 addition & 12 deletions bib/cmd/bootc-image-builder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"io/fs"
"log"
"os"
"os/exec"
"path/filepath"
"runtime/debug"
"strconv"
Expand Down Expand Up @@ -46,16 +45,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 {
Expand Down Expand Up @@ -271,7 +260,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:
Expand Down
4 changes: 2 additions & 2 deletions bib/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ 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/images v0.209.0
github.com/osbuild/image-builder-cli v0.0.0-20251105211730-5fddcab334fe
github.com/osbuild/images v0.210.0
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.10.1
github.com/spf13/pflag v1.0.10
Expand Down
8 changes: 4 additions & 4 deletions bib/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,10 @@ 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.209.0 h1:9BRf+N0op1WbQkc+7zVRBZxg4dqS4lty3i2stF3G9lo=
github.com/osbuild/images v0.209.0/go.mod h1:tZqcrs3eNUA0VPs1h3YCnbnpAskVVfo36CIi2USSfDs=
github.com/osbuild/image-builder-cli v0.0.0-20251105211730-5fddcab334fe h1:QkM7cmMeLQK0KgP5nASxz4nF1E2Fq/KM7lGX9Pdr4tM=
github.com/osbuild/image-builder-cli v0.0.0-20251105211730-5fddcab334fe/go.mod h1:IkrRthNZtHV7wbPtvLIv+BY+9jyTZL8EpI2nzCX5nv4=
github.com/osbuild/images v0.210.0 h1:I1OFYl/9mtOMQccRv3YBxWr14uJDG+CwTgmy4kYISpU=
github.com/osbuild/images v0.210.0/go.mod h1:tZqcrs3eNUA0VPs1h3YCnbnpAskVVfo36CIi2USSfDs=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down
Loading