mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-09-11 01:57:53 +00:00
dce3d6ee9d
Also, do a general cleanup of all the timeout code. Changes include: - Convert from int to *uint where possible. Timeouts cannot be negative, hence the uint change; and a timeout of 0 is valid, so we need a new way to detect that the user set a timeout (hence, pointer). - Change name in the database to avoid conflicts between new data type and old one. This will cause timeouts set with 4.2.0 to be lost, but considering nobody is using the feature at present (and the lack of validation means we could have invalid, negative timeouts in the DB) this feels safe. - Ensure volume plugin timeouts can only be used with volumes created using a plugin. Timeouts on the local driver are nonsensical. - Remove the existing test, as it did not use a volume plugin. Write a new test that does. The actual plumbing of the containers.conf timeout in is one line in volume_api.go; the remainder are the above-described cleanups. Backported to v4.2.0-rhel per RHBZ 2125241 Signed-off-by: Matthew Heon <mheon@redhat.com>
78 lines
2.2 KiB
Text
78 lines
2.2 KiB
Text
[containers]
|
|
|
|
# A list of ulimits to be set in containers by default, specified as
|
|
# "<ulimit name>=<soft limit>:<hard limit>", for example:
|
|
# "nofile=1024:2048"
|
|
# See setrlimit(2) for a list of resource names.
|
|
# Any limit not specified here will be inherited from the process launching the
|
|
# container engine.
|
|
# Ulimits has limits for non privileged container engines.
|
|
#
|
|
default_ulimits = [
|
|
"nofile=500:500",
|
|
]
|
|
|
|
# Environment variable list for the conmon process; used for passing necessary
|
|
# environment variables to conmon or the runtime.
|
|
#
|
|
env = [
|
|
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
|
|
"foo=bar",
|
|
]
|
|
|
|
# container engines use container separation using MAC(SELinux) labeling.
|
|
# Flag is ignored on label disabled systems.
|
|
#
|
|
label = true
|
|
|
|
# Size of /dev/shm. Specified as <number><unit>.
|
|
# Unit is optional, values:
|
|
# b (bytes), k (kilobytes), m (megabytes), or g (gigabytes).
|
|
# If the unit is omitted, the system uses bytes.
|
|
#
|
|
shm_size = "201k"
|
|
|
|
# List of devices. Specified as
|
|
# "<device-on-host>:<device-on-container>:<permissions>", for example:
|
|
# "/dev/sdc:/dev/xvdc:rwm".
|
|
# If it is empty or commented out, only the default devices will be used
|
|
#
|
|
devices = [
|
|
"/dev/zero:/dev/notone:rwm",
|
|
]
|
|
|
|
default_sysctls = [
|
|
"net.ipv4.ping_group_range=0 1000",
|
|
]
|
|
|
|
dns_searches=[ "foobar.com", ]
|
|
dns_servers=[ "1.2.3.4", ]
|
|
dns_options=[ "debug", ]
|
|
|
|
tz = "Pacific/Honolulu"
|
|
|
|
umask = "0002"
|
|
|
|
annotations=["run.oci.keep_original_groups=1",]
|
|
|
|
no_hosts=true
|
|
[engine]
|
|
|
|
network_cmd_options=["allow_host_loopback=true"]
|
|
service_timeout=1234
|
|
|
|
volume_plugin_timeout = 15
|
|
|
|
# We need to ensure each test runs on a separate plugin instance...
|
|
# For now, let's just make a bunch of plugin paths and have each test use one.
|
|
[engine.volume_plugins]
|
|
testvol0 = "/run/docker/plugins/testvol0.sock"
|
|
testvol1 = "/run/docker/plugins/testvol1.sock"
|
|
testvol2 = "/run/docker/plugins/testvol2.sock"
|
|
testvol3 = "/run/docker/plugins/testvol3.sock"
|
|
testvol4 = "/run/docker/plugins/testvol4.sock"
|
|
testvol5 = "/run/docker/plugins/testvol5.sock"
|
|
testvol6 = "/run/docker/plugins/testvol6.sock"
|
|
testvol7 = "/run/docker/plugins/testvol7.sock"
|
|
testvol8 = "/run/docker/plugins/testvol8.sock"
|
|
testvol9 = "/run/docker/plugins/testvol9.sock"
|