rpms/containers-common
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to grab latest man pages and configuration files

Browse Source
This commit is contained in:
Daniel J Walsh 2021-09-08 11:54:45 -04:00
parent 449701c43a
commit 5df3446d7a
No known key found for this signature in database
GPG Key ID: A2DF901DABE2C028
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
containers-common.spec
View File

@ -15,7 +15,7 @@
Epoch: 4 Epoch: 4
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 26%{?dist} Release: 27%{?dist}
Summary: Common configuration and documentation for containers Summary: Common configuration and documentation for containers
License: ASL 2.0 License: ASL 2.0
BuildArch: noarch BuildArch: noarch
@ -150,6 +150,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
%{_datadir}/rhel/secrets/* %{_datadir}/rhel/secrets/*
%changelog %changelog
* Wed Sep 8 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-27
- Update to grab latest man pages and configuration files
* Wed Aug 25 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-26 * Wed Aug 25 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-26
- Add memfd_secret to seccomp.json - Add memfd_secret to seccomp.json

8
containers.conf
View File

@ -262,7 +262,13 @@ log_driver = "journald"
# Path to directory where CNI plugin binaries are located. # 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. # The network name of the default CNI network to attach pods to.
# #

15
containers.conf.5.md
View File

@ -1,4 +1,4 @@
% containers.conf(5) Container engine configuration file % containers.conf 5 Container engine configuration file
# NAME # NAME
containers.conf - The container engine configuration file specifies default 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 The `network` table contains settings pertaining to the management of CNI
plugins. plugins.
**cni_plugin_dirs**=["/opt/cni/bin/",] **cni_plugin_dirs**=[]
List of paths to directories where CNI plugin binaries are located. 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" **default_network**="podman"
The network name of the default CNI network to attach pods to. The network name of the default CNI network to attach pods to.

4
shortnames.conf
View File

@ -61,5 +61,7 @@
"busybox" = "docker.io/library/busybox" "busybox" = "docker.io/library/busybox"
# php # php
"php" = "docker.io/library/php" "php" = "docker.io/library/php"
#python # python
"python" = "docker.io/library/python" "python" = "docker.io/library/python"
# node
"node" = "docker.io/library/node"