diff --git a/containers-common.spec b/containers-common.spec index 7f97d42..1d38d84 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -15,7 +15,7 @@ Epoch: 4 Name: containers-common Version: 1 -Release: 26%{?dist} +Release: 27%{?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 +* Wed Sep 8 2021 Dan Walsh - 4:1-27 +- Update to grab latest man pages and configuration files + * Wed Aug 25 2021 Dan Walsh - 4:1-26 - Add memfd_secret to seccomp.json diff --git a/containers.conf b/containers.conf index b4894b6..e5302c1 100644 --- a/containers.conf +++ b/containers.conf @@ -262,7 +262,13 @@ log_driver = "journald" # Path to directory where CNI plugin binaries are located. # -#cni_plugin_dirs = ["/usr/libexec/cni"] +#cni_plugin_dirs = [ +# "/usr/local/libexec/cni", +# "/usr/libexec/cni", +# "/usr/local/lib/cni", +# "/usr/lib/cni", +# "/opt/cni/bin", +#] # The network name of the default CNI network to attach pods to. # diff --git a/containers.conf.5.md b/containers.conf.5.md index 94ce775..84615f3 100644 --- a/containers.conf.5.md +++ b/containers.conf.5.md @@ -1,4 +1,4 @@ -% containers.conf(5) Container engine configuration file +% containers.conf 5 Container engine configuration file # NAME containers.conf - The container engine configuration file specifies default @@ -279,10 +279,21 @@ Options are: The `network` table contains settings pertaining to the management of CNI plugins. -**cni_plugin_dirs**=["/opt/cni/bin/",] +**cni_plugin_dirs**=[] List of paths to directories where CNI plugin binaries are located. +The default list is: +``` +cni_plugin_dirs = [ + "/usr/local/libexec/cni", + "/usr/libexec/cni", + "/usr/local/lib/cni", + "/usr/lib/cni", + "/opt/cni/bin", +] +``` + **default_network**="podman" The network name of the default CNI network to attach pods to. diff --git a/shortnames.conf b/shortnames.conf index 28d22f1..0f6827c 100644 --- a/shortnames.conf +++ b/shortnames.conf @@ -61,5 +61,7 @@ "busybox" = "docker.io/library/busybox" # php "php" = "docker.io/library/php" - #python + # python "python" = "docker.io/library/python" + # node + "node" = "docker.io/library/node"