From 5ff846b5fd3d2d5307a60ced3bd8224152d52c09 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 19 Mar 2021 10:19:00 -0400 Subject: [PATCH] containers-common-4:1-14 - also provide skopeo-containers - bump release tag for smooth upgrade from f34 - use latest upstream files Signed-off-by: Lokesh Mandvekar --- containers-common.spec | 8 +++++++- containers-registries.conf.d.5.md | 2 +- containers-storage.conf.5.md | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/containers-common.spec b/containers-common.spec index 4e80518..e8786c7 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -15,11 +15,12 @@ Epoch: 4 Name: containers-common Version: 1 -Release: 10%{?dist} +Release: 13%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch BuildRequires: go-md2man +Provides: skopeo-containers = %{epoch}:%{version}-%{release} Recommends: fuse-overlayfs Recommends: slirp4netns Source1: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md @@ -114,6 +115,11 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret %{_datadir}/rhel/secrets/* %changelog +* Fri Mar 19 2021 Lokesh Mandvekar - 4:1-14 +- also provide skopeo-containers +- bump release tag for smooth upgrade from f34 +- use latest upstream files + * Thu Feb 18 2021 Lokesh Mandvekar - 4:1-10 - install shortnames.conf as 000-shrotnames.conf diff --git a/containers-registries.conf.d.5.md b/containers-registries.conf.d.5.md index 2d85e8b..eaa5894 100644 --- a/containers-registries.conf.d.5.md +++ b/containers-registries.conf.d.5.md @@ -17,7 +17,7 @@ Once the main configuration at `/etc/containers/registries.conf` is loaded, the files in `/etc/containers/registries.conf.d` are loaded in alpha-numerical order. Then the conf files in `$HOME/.config/containers/registries.conf.d` are loaded in alpha-numerical order, if they exist. If the `$HOME/.config/containers/registries.conf` is loaded, only the conf files under `$HOME/.config/containers/registries.conf.d` are loaded in alpha-numerical order. Specified fields in a conf file will overwrite any previous setting. Note -that only files with the `.conf` prefix are loaded, other files and +that only files with the `.conf` suffix are loaded, other files and sub-directories are ignored. For instance, setting the `unqualified-search-registries` in diff --git a/containers-storage.conf.5.md b/containers-storage.conf.5.md index ba6fcaa..7f9e003 100644 --- a/containers-storage.conf.5.md +++ b/containers-storage.conf.5.md @@ -29,7 +29,10 @@ The `storage` table supports the following options: **driver**="" container storage driver Default Copy On Write (COW) container storage driver. Valid drivers are "overlay", "vfs", "devmapper", "aufs", "btrfs", and "zfs". Some drivers (for example, "zfs", "btrfs", and "aufs") may not work if your kernel lacks support for the filesystem. - This field is requiered to guarantee proper operation. + This field is required to guarantee proper operation. + Valid rootless drivers are "btrfs", "overlay", and "vfs". + Rootless users default to the driver defined in the system configuration when possible. + When the system configuration uses an unsupported rootless driver, rootless users default to "overlay" if available, otherwise "vfs". **graphroot**="" container storage graph dir (default: "/var/lib/containers/storage")