mirror of
https://github.com/containers/podman.git
synced 2025-09-27 08:43:52 +08:00
Update c/image to v4.0.1 and buildah to 1.11.3
This requires updating all import paths throughout, and a matching buildah update to interoperate. I can't figure out the reason for go.mod tracking github.com/containers/image v3.0.2+incompatible // indirect ((go mod graph) lists it as a direct dependency of libpod, but (go list -json -m all) lists it as an indirect dependency), but at least looking at the vendor subdirectory, it doesn't seem to be actually used in the built binaries. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
12
vendor/github.com/containers/buildah/info.go
generated
vendored
12
vendor/github.com/containers/buildah/info.go
generated
vendored
@ -11,6 +11,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/containers/buildah/pkg/cgroups"
|
||||
"github.com/containers/buildah/pkg/unshare"
|
||||
"github.com/containers/storage"
|
||||
"github.com/containers/storage/pkg/system"
|
||||
@ -45,6 +46,17 @@ func hostInfo() map[string]interface{} {
|
||||
info["arch"] = runtime.GOARCH
|
||||
info["cpus"] = runtime.NumCPU()
|
||||
info["rootless"] = unshare.IsRootless()
|
||||
|
||||
unified, err := cgroups.IsCgroup2UnifiedMode()
|
||||
if err != nil {
|
||||
logrus.Error(err, "err reading cgroups mode")
|
||||
}
|
||||
cgroupVersion := "v1"
|
||||
if unified {
|
||||
cgroupVersion = "v2"
|
||||
}
|
||||
info["CgroupVersion"] = cgroupVersion
|
||||
|
||||
mi, err := system.ReadMemInfo()
|
||||
if err != nil {
|
||||
logrus.Error(err, "err reading memory info")
|
||||
|
Reference in New Issue
Block a user