mirror of
https://github.com/containers/podman.git
synced 2025-12-02 11:08:36 +08:00
Switch to fixed common
Signed-off-by: James Hewitt <james.hewitt@uk.ibm.com>
This commit is contained in:
7
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
7
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@@ -96,6 +96,13 @@ type ContainersConfig struct {
|
||||
// "memory.high=1073741824" sets the memory.high limit to 1GB.
|
||||
CgroupConf attributedstring.Slice `toml:"cgroup_conf,omitempty"`
|
||||
|
||||
// When no hostname is set for a container, use the container's name, with
|
||||
// characters not valid for a hostname removed, as the hostname instead of
|
||||
// the first 12 characters of the container's ID. Containers not running
|
||||
// in a private UTS namespace will have their hostname set to the host's
|
||||
// hostname regardless of this setting.
|
||||
ContainerNameAsHostName bool `toml:"container_name_as_hostname,omitempty"`
|
||||
|
||||
// Capabilities to add to all containers.
|
||||
DefaultCapabilities attributedstring.Slice `toml:"default_capabilities,omitempty"`
|
||||
|
||||
|
||||
8
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
8
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
@@ -58,6 +58,14 @@
|
||||
#
|
||||
#cgroups = "enabled"
|
||||
|
||||
# When no hostname is set for a container, use the container's name, with
|
||||
# characters not valid for a hostname removed, as the hostname instead of
|
||||
# the first 12 characters of the container's ID. Containers not running
|
||||
# in a private UTS namespace will have their hostname set to the host's
|
||||
# hostname regardless of this setting.
|
||||
#
|
||||
#container_name_as_hostname = false
|
||||
|
||||
# List of default capabilities for containers. If it is empty or commented out,
|
||||
# the default capabilities defined in the container engine will be added.
|
||||
#
|
||||
|
||||
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
@@ -29,6 +29,12 @@
|
||||
#
|
||||
#base_hosts_file = ""
|
||||
|
||||
# When no hostname is set for a container, use the container's name, with
|
||||
# characters not valid for a hostname removed, as the hostname instead of
|
||||
# the first 12 characters of the container's ID.
|
||||
#
|
||||
#container_name_as_hostname = false
|
||||
|
||||
# The database backend of Podman. Supported values are "" (default), "boltdb"
|
||||
# and "sqlite". An empty value means it will check whenever a boltdb already
|
||||
# exists and use it when it does, otherwise it will use sqlite as default
|
||||
|
||||
Reference in New Issue
Block a user