diff --git a/containers-common.spec b/containers-common.spec index 1d38d84..f73934b 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -15,7 +15,7 @@ Epoch: 4 Name: containers-common Version: 1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch @@ -150,6 +150,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret %{_datadir}/rhel/secrets/* %changelog +* Tue Sep 14 2021 Dan Walsh - 4:1-28 +- Update to grab latest man pages and configuration files + * Wed Sep 8 2021 Dan Walsh - 4:1-27 - Update to grab latest man pages and configuration files diff --git a/containers-transports.5.md b/containers-transports.5.md index c87283f..c23d487 100644 --- a/containers-transports.5.md +++ b/containers-transports.5.md @@ -57,12 +57,12 @@ An image stored in the docker daemon's internal storage. The image must be specified as a _docker-reference_ or in an alternative _algo:digest_ format when being used as an image source. The _algo:digest_ refers to the image ID reported by docker-inspect(1). -### **oci:**_path[:tag]_ +### **oci:**_path[:reference]_ An image compliant with the "Open Container Image Layout Specification" at _path_. -Using a _tag_ is optional and allows for storing multiple images at the same _path_. +Using a _reference_ is optional and allows for storing multiple images at the same _path_. -### **oci-archive:**_path[:tag]_ +### **oci-archive:**_path[:reference]_ An image compliant with the "Open Container Image Layout Specification" stored as a tar(1) archive at _path_. diff --git a/containers.conf b/containers.conf index e5302c1..d20eb17 100644 --- a/containers.conf +++ b/containers.conf @@ -341,6 +341,15 @@ log_driver = "journald" # #events_logger = "journald" +# A is a list of directories which are used to search for helper binaries. +# +#helper_binaries_dir = [ +# "/usr/local/libexec/podman", +# "/usr/local/lib/podman", +# "/usr/libexec/podman", +# "/usr/lib/podman", +#] + # Path to OCI hooks directories for automatically executed hooks. # #hooks_dir = [ @@ -442,15 +451,20 @@ log_driver = "journald" # List of the OCI runtimes that support --format=json. When json is supported # engine will use it for reporting nicer errors. # -#runtime_supports_json = ["crun", "runc", "kata", "runsc"] +#runtime_supports_json = ["crun", "runc", "kata", "runsc", "krun"] # List of the OCI runtimes that supports running containers with KVM Separation. # -#runtime_supports_kvm = ["kata"] +#runtime_supports_kvm = ["kata", "krun"] # List of the OCI runtimes that supports running containers without cgroups. # -#runtime_supports_nocgroups = ["crun"] +#runtime_supports_nocgroups = ["crun", "krun"] + +# Default location for storing temporary container image content. Can be overridden with the TMPDIR environment +# variable. If you specify "storage", then the location of the +# container/storage tmp directory will be used. +# image_copy_tmp_dir="/var/tmp" # Directory for persistent engine files (database, etc) # By default, this will be configured relative to where the containers/storage @@ -489,7 +503,7 @@ log_driver = "journald" # #volume_path = "/var/lib/containers/storage/volumes" -# Paths to look for a valid OCI runtime (crun, runc, kata, runsc, etc) +# Paths to look for a valid OCI runtime (crun, runc, kata, runsc, krun, etc) [engine.runtimes] #crun = [ # "/usr/bin/crun", @@ -532,6 +546,11 @@ log_driver = "journald" # "/run/current-system/sw/bin/runsc", #] +#krun = [ +# "/usr/bin/krun", +# "/usr/local/bin/krun", +#] + [engine.volume_plugins] #testplugin = "/run/podman/plugins/test.sock" diff --git a/containers.conf.5.md b/containers.conf.5.md index 84615f3..bf227be 100644 --- a/containers.conf.5.md +++ b/containers.conf.5.md @@ -378,6 +378,29 @@ if you want to set environment variables for the container. Default method to use when logging events. Valid values: `file`, `journald`, and `none`. +**helper_binaries_dir**=["/usr/libexec/podman", ...] + +A is a list of directories which are used to search for helper binaries. + +The default paths on Linux are: +- `/usr/local/libexec/podman` +- `/usr/local/lib/podman` +- `/usr/libexec/podman` +- `/usr/lib/podman` + +The default paths on macOS are: +- `/usr/local/opt/podman/libexec` +- `/opt/homebrew/bin` +- `/opt/homebrew/opt/podman/libexec` +- `/usr/local/bin` +- `/usr/local/libexec/podman` +- `/usr/local/lib/podman` +- `/usr/libexec/podman` +- `/usr/lib/podman` + +The default path on Windows is: +- `C:\Program Files\RedHat\Podman` + **hooks_dir**=["/etc/containers/oci/hooks.d", ...] Path to the OCI hooks directories for automatically executed hooks. @@ -479,18 +502,26 @@ Default OCI specific runtime in runtimes that will be used by default. Must refer to a member of the runtimes table. Default runtime will be searched for on the system using the priority: "crun", "runc", "kata". -**runtime_supports_json**=["crun", "runc", "kata", "runsc"] +**runtime_supports_json**=["crun", "runc", "kata", "runsc", "krun"] The list of the OCI runtimes that support `--format=json`. -**runtime_supports_kvm**=["kata"] +**runtime_supports_kvm**=["kata", "krun"] The list of OCI runtimes that support running containers with KVM separation. -**runtime_supports_nocgroups**=["crun"] +**runtime_supports_nocgroups**=["crun", "krun"] The list of OCI runtimes that support running containers without CGroups. +**image_copy_tmp_dir**="/var/tmp" + +Default location for storing temporary container image content. Can be +overridden with the TMPDIR environment variable. If you specify "storage", then +the location of the container/storage tmp directory will be used. If set then it +is the users responsibility to cleanup storage. Configure tmpfiles.d(5) to +cleanup storage. + **static_dir**="/var/lib/containers/storage/libpod" Directory for persistent libpod files (database, etc). @@ -586,6 +617,6 @@ is used for the storage.conf file rather than the default. This is primarily used for testing. # SEE ALSO -containers-storage.conf(5), containers-policy.json(5), containers-registries.conf(5) +containers-storage.conf(5), containers-policy.json(5), containers-registries.conf(5), tmpfiles.d(5) [toml]: https://github.com/toml-lang/toml