fix(deps): update github.com/containers/common digest to 5547996

Signed-off-by: Renovate Bot <bot@renovateapp.com>
This commit is contained in:
renovate[bot]
2023-04-21 12:37:46 +00:00
committed by GitHub
parent e9c13354eb
commit d16c880fb1
9 changed files with 35 additions and 33 deletions

View File

@@ -392,6 +392,11 @@ default_sysctls = [
# short-name aliases defined in containers-registries.conf(5).
#compat_api_enforce_docker_hub = true
# The database backend of Podman. Supported values are "boltdb" (default) and
# "sqlite". Please run `podman-system-reset` prior to changing the database
# backend of an existing deployment, to make sure Podman can operate correctly.
#database_backend="boltdb"
# Specify the keys sequence used to detach a container.
# Format is a single character [a-Z] or a comma separated sequence of
# `ctrl-<value>`, where `<value>` is one of:

View File

@@ -29,6 +29,11 @@
#
#base_hosts_file = ""
# The database backend of Podman. Supported values are "boltdb" (default) and
# "sqlite". Please run `podman-system-reset` prior to changing the database
# backend of an existing deployment, to make sure Podman can operate correctly.
#database_backend="boltdb"
# List of default capabilities for containers. If it is empty or commented out,
# the default capabilities defined in the container engine will be added.
#

View File

@@ -1,13 +1,13 @@
//go:build !linux && !windows
// +build !linux,!windows
package sysinfo
import (
"runtime"
)
import "runtime"
// NumCPU returns the number of CPUs
// NumCPU returns the number of CPUs. On Linux and Windows, it returns
// the number of CPUs which are currently online. On other platforms,
// it returns [runtime.NumCPU].
func NumCPU() int {
if ncpu := numCPU(); ncpu > 0 {
return ncpu
}
return runtime.NumCPU()
}

View File

@@ -4,7 +4,6 @@
package sysinfo
import (
"runtime"
"unsafe"
"golang.org/x/sys/unix"
@@ -34,11 +33,3 @@ func numCPU() int {
}
return ncpu
}
// NumCPU returns the number of CPUs which are currently online
func NumCPU() int {
if ncpu := numCPU(); ncpu > 0 {
return ncpu
}
return runtime.NumCPU()
}

View File

@@ -0,0 +1,10 @@
//go:build !linux && !windows
// +build !linux,!windows
package sysinfo
import "runtime"
func numCPU() int {
return runtime.NumCPU()
}

View File

@@ -4,7 +4,6 @@
package sysinfo
import (
"runtime"
"unsafe"
"golang.org/x/sys/windows"
@@ -28,11 +27,3 @@ func numCPU() int {
ncpu := int(popcnt(uint64(mask)))
return ncpu
}
// NumCPU returns the number of CPUs which are currently online
func NumCPU() int {
if ncpu := numCPU(); ncpu > 0 {
return ncpu
}
return runtime.NumCPU()
}