mirror of
https://github.com/containers/podman.git
synced 2025-12-11 01:11:30 +08:00
vendor: update containers/common
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
1
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
1
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@@ -214,6 +214,7 @@ type ContainersConfig struct {
|
||||
UserNS string `toml:"userns,omitempty"`
|
||||
|
||||
// UserNSSize how many UIDs to allocate for automatically created UserNS
|
||||
// Deprecated: no user of this field is known.
|
||||
UserNSSize int `toml:"userns_size,omitempty,omitzero"`
|
||||
}
|
||||
|
||||
|
||||
4
vendor/github.com/containers/common/pkg/config/config_local.go
generated
vendored
4
vendor/github.com/containers/common/pkg/config/config_local.go
generated
vendored
@@ -11,6 +11,7 @@ import (
|
||||
"strings"
|
||||
"syscall"
|
||||
|
||||
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
|
||||
units "github.com/docker/go-units"
|
||||
)
|
||||
|
||||
@@ -57,6 +58,9 @@ func (c *EngineConfig) validatePaths() error {
|
||||
|
||||
func (c *ContainersConfig) validateDevices() error {
|
||||
for _, d := range c.Devices {
|
||||
if cdi.IsQualifiedName(d) {
|
||||
continue
|
||||
}
|
||||
_, _, _, err := Device(d)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
6
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
6
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
@@ -244,12 +244,6 @@ default_sysctls = [
|
||||
#
|
||||
#userns = "host"
|
||||
|
||||
# Number of UIDs to allocate for the automatic container creation.
|
||||
# UIDs are allocated from the "container" UIDs listed in
|
||||
# /etc/subuid & /etc/subgid
|
||||
#
|
||||
#userns_size = 65536
|
||||
|
||||
# Default way to to create a UTS namespace for the container
|
||||
# Options are:
|
||||
# `private` Create private UTS Namespace for the container.
|
||||
|
||||
6
vendor/github.com/containers/common/pkg/config/containers.conf-freebsd
generated
vendored
6
vendor/github.com/containers/common/pkg/config/containers.conf-freebsd
generated
vendored
@@ -212,12 +212,6 @@ default_sysctls = [
|
||||
#
|
||||
#userns = "host"
|
||||
|
||||
# Number of UIDs to allocate for the automatic container creation.
|
||||
# UIDs are allocated from the "container" UIDs listed in
|
||||
# /etc/subuid & /etc/subgid
|
||||
#
|
||||
#userns_size = 65536
|
||||
|
||||
# Default way to to create a UTS namespace for the container
|
||||
# Options are:
|
||||
# `private` Create private UTS Namespace for the container.
|
||||
|
||||
3
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
3
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@@ -158,6 +158,7 @@ const (
|
||||
// DefaultShmSize is the default upper limit on the size of tmpfs mounts.
|
||||
DefaultShmSize = "65536k"
|
||||
// DefaultUserNSSize indicates the default number of UIDs allocated for user namespace within a container.
|
||||
// Deprecated: no user of this field is known.
|
||||
DefaultUserNSSize = 65536
|
||||
// OCIBufSize limits maximum LogSizeMax.
|
||||
OCIBufSize = 8192
|
||||
@@ -232,7 +233,7 @@ func DefaultConfig() (*Config, error) {
|
||||
TZ: "",
|
||||
Umask: "0022",
|
||||
UTSNS: "private",
|
||||
UserNSSize: DefaultUserNSSize,
|
||||
UserNSSize: DefaultUserNSSize, // Deprecated
|
||||
},
|
||||
Network: NetworkConfig{
|
||||
DefaultNetwork: "podman",
|
||||
|
||||
Reference in New Issue
Block a user