containers-common-4:1-19

- use container-selinux 2.162.1 and use latest configs

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2021-05-18 11:53:01 -04:00
parent ef305af98c
commit 0f389750de
3 changed files with 9 additions and 3 deletions

View File

@ -15,13 +15,13 @@
Epoch: 4 Epoch: 4
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 18%{?dist} Release: 19%{?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
BuildRequires: go-md2man BuildRequires: go-md2man
Provides: skopeo-containers = %{epoch}:%{version}-%{release} Provides: skopeo-containers = %{epoch}:%{version}-%{release}
Requires: (container-selinux >= 2:2.160.0 if selinux-policy) Requires: (container-selinux >= 2:2.162.1 if selinux-policy)
Requires: oci-runtime Requires: oci-runtime
Recommends: fuse-overlayfs Recommends: fuse-overlayfs
Recommends: slirp4netns Recommends: slirp4netns
@ -136,6 +136,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
%{_datadir}/rhel/secrets/* %{_datadir}/rhel/secrets/*
%changelog %changelog
* Tue May 18 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-19
- use container-selinux 2.162.1 and use latest configs
* Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18 * Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18
- Update containers.conf to latest, and change default log-driver to journald. - Update containers.conf to latest, and change default log-driver to journald.

View File

@ -87,6 +87,9 @@ The `storage.options` table supports the following options:
**auto-userns-max-size**=65536 **auto-userns-max-size**=65536
Auto-userns-max-size is the maximum size for a user namespace created automatically. Auto-userns-max-size is the maximum size for a user namespace created automatically.
**disable-volatile**=true
If disable-volatile is set, then the "volatile" mount optimization is disabled for all the containers.
### STORAGE OPTIONS FOR AUFS TABLE ### STORAGE OPTIONS FOR AUFS TABLE
The `storage.options.aufs` table supports the following options: The `storage.options.aufs` table supports the following options:

View File

@ -175,7 +175,7 @@ the container.
Indicates whether the container engine uses MAC(SELinux) container separation via labeling. This option is ignored on disabled systems. Indicates whether the container engine uses MAC(SELinux) container separation via labeling. This option is ignored on disabled systems.
**log_driver**="journald" **log_driver**="k8s-file"
Logging driver for the container. Available options: `k8s-file` and `journald`. Logging driver for the container. Available options: `k8s-file` and `journald`.