opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-05 05:57:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18274 from containers/renovate/common-image-and-storage-deps

Browse Source 
fix(deps): update github.com/containers/common digest to 5547996
This commit is contained in:
openshift-ci[bot]
2023-04-21 14:48:48 +00:00
committed by GitHub
parent d4d733ed82 d16c880fb1
commit c08859bd74
9 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -13,7 +13,7 @@ require (
github.com/containernetworking/cni v1.1.2
github.com/containernetworking/plugins v1.2.0
github.com/containers/buildah v1.30.0
github.com/containers/common v0.52.1-0.20230411124844-19b624d9a20d
github.com/containers/common v0.52.1-0.20230421100625-554799639fc8
github.com/containers/conmon v2.0.20+incompatible
github.com/containers/image/v5 v5.25.0
github.com/containers/libhvee v0.0.5

4
go.sum
View File

@ -239,8 +239,8 @@ github.com/containernetworking/plugins v1.2.0 h1:SWgg3dQG1yzUo4d9iD8cwSVh1VqI+bP
github.com/containernetworking/plugins v1.2.0/go.mod h1:/VjX4uHecW5vVimFa1wkG4s+r/s9qIfPdqlLF4TW8c4=
github.com/containers/buildah v1.30.0 h1:mdp2COGKFFEZNEGP8VZ5ITuUFVNPFoH+iK2sSesNfTA=
github.com/containers/buildah v1.30.0/go.mod h1:lyMLZIevpAa6zSzjRl7z4lFJMCMQLFjfo56YIefaB/U=
github.com/containers/common v0.52.1-0.20230411124844-19b624d9a20d h1:vwGEGW7uQtnTCS5qoiMsts7fn7wPRjbHiAC00Cbc22E=
github.com/containers/common v0.52.1-0.20230411124844-19b624d9a20d/go.mod h1:dNJJVNBu1wJtAH+vFIMXV+fQHBdEVNmNP3ImjbKper4=
github.com/containers/common v0.52.1-0.20230421100625-554799639fc8 h1:W3SNyracX5Lhnvg5gI0oLT68247HOE5vpt5J9h/FAC8=
github.com/containers/common v0.52.1-0.20230421100625-554799639fc8/go.mod h1:pABPxJwlTE8oYk9/2BW0e0mumkuhJHIPsABHTGRXN3w=
github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg=
github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
github.com/containers/image/v5 v5.25.0 h1:TJ0unmalbU+scd0i3Txap2wjGsAnv06MSCwgn6bsizk=

5
vendor/github.com/containers/common/pkg/config/containers.conf generated vendored
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:

5
vendor/github.com/containers/common/pkg/config/containers.conf-freebsd generated vendored
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.
#

14
vendor/github.com/containers/common/pkg/sysinfo/numcpu.go generated vendored
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()
}

9
vendor/github.com/containers/common/pkg/sysinfo/numcpu_linux.go generated vendored
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()
}

10
vendor/github.com/containers/common/pkg/sysinfo/numcpu_other.go generated vendored Normal file
View File

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

9
vendor/github.com/containers/common/pkg/sysinfo/numcpu_windows.go generated vendored
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()
}

2
vendor/modules.txt vendored
View File

@ -125,7 +125,7 @@ github.com/containers/buildah/pkg/rusage
github.com/containers/buildah/pkg/sshagent
github.com/containers/buildah/pkg/util
github.com/containers/buildah/util
# github.com/containers/common v0.52.1-0.20230411124844-19b624d9a20d
# github.com/containers/common v0.52.1-0.20230421100625-554799639fc8
## explicit; go 1.18
github.com/containers/common/libimage
github.com/containers/common/libimage/define