From 8b8f89c5673357d6f3d69e80ae08b3e1125f0c2a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 7 Oct 2021 08:51:51 -0400 Subject: [PATCH] Update to grab latest man pages and configuration files --- containers-auth.json.5.md | 2 +- containers-certs.d.5.md | 2 +- containers-common.spec | 5 ++++- containers-policy.json.5.md | 2 +- containers-registries.conf.5.md | 2 +- containers-registries.conf.d.5.md | 2 +- containers-registries.d.5.md | 2 +- containers-signature.5.md | 6 ++++-- containers-storage.conf.5.md | 6 ++++++ containers-transports.5.md | 2 +- storage.conf | 6 ++++++ 11 files changed, 27 insertions(+), 10 deletions(-) diff --git a/containers-auth.json.5.md b/containers-auth.json.5.md index 081a984..892cb70 100644 --- a/containers-auth.json.5.md +++ b/containers-auth.json.5.md @@ -1,4 +1,4 @@ -% containers-auth.json(5) +% containers-auth.json 5 # NAME containers-auth.json - syntax for the registry authentication file diff --git a/containers-certs.d.5.md b/containers-certs.d.5.md index 69ddb23..828ff76 100644 --- a/containers-certs.d.5.md +++ b/containers-certs.d.5.md @@ -1,4 +1,4 @@ -% containers-certs.d(5) +% containers-certs.d 5 Directory for storing custom container-registry TLS configurations # NAME containers-certs.d - Directory for storing custom container-registry TLS configurations diff --git a/containers-common.spec b/containers-common.spec index 8902fe4..c2c909b 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -16,7 +16,7 @@ Epoch: 4 Name: containers-common Version: 1 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch @@ -161,6 +161,9 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret %{_datadir}/rhel/secrets/* %changelog +* Fri Oct 1 2021 Dan Walsh - 4:1-33 +- Update to grab latest man pages and configuration files + * Tue Oct 5 2021 Dan Walsh - 4:1-32 - Add .containerignore.5 link diff --git a/containers-policy.json.5.md b/containers-policy.json.5.md index ced943a..62f5855 100644 --- a/containers-policy.json.5.md +++ b/containers-policy.json.5.md @@ -1,4 +1,4 @@ -% CONTAINERS-POLICY.JSON(5) policy.json Man Page +% CONTAINERS-POLICY.JSON 5 policy.json Man Page % Miloslav Trmač % September 2016 diff --git a/containers-registries.conf.5.md b/containers-registries.conf.5.md index a10c819..928387b 100644 --- a/containers-registries.conf.5.md +++ b/containers-registries.conf.5.md @@ -1,4 +1,4 @@ -% CONTAINERS-REGISTRIES.CONF(5) System-wide registry configuration file +% CONTAINERS-REGISTRIES.CONF 5 System-wide registry configuration file % Brent Baude % Aug 2017 diff --git a/containers-registries.conf.d.5.md b/containers-registries.conf.d.5.md index eaa5894..563ccfd 100644 --- a/containers-registries.conf.d.5.md +++ b/containers-registries.conf.d.5.md @@ -1,4 +1,4 @@ -% CONTAINERS-REGISTRIES.CONF.D(5) +% CONTAINERS-REGISTRIES.CONF.D 5 % Valentin Rothberg % Mar 2020 diff --git a/containers-registries.d.5.md b/containers-registries.d.5.md index ad58087..0707961 100644 --- a/containers-registries.d.5.md +++ b/containers-registries.d.5.md @@ -1,4 +1,4 @@ -% CONTAINERS-REGISTRIES.D(5) Registries.d Man Page +% containers-registries.d 5 Registries.d Man Page % Miloslav Trmač % August 2016 diff --git a/containers-signature.5.md b/containers-signature.5.md index 1b18ff0..2bbb500 100644 --- a/containers-signature.5.md +++ b/containers-signature.5.md @@ -1,9 +1,11 @@ -% container-signature(5) Container signature format +% container-signature 5 Container signature format % Miloslav Trmač % March 2017 -# Container signature format +# NAME +container-signature - Container signature format +# DESCRIPTION This document describes the format of container signatures, as implemented by the `github.com/containers/image/signature` package. diff --git a/containers-storage.conf.5.md b/containers-storage.conf.5.md index d06ca09..df79b61 100644 --- a/containers-storage.conf.5.md +++ b/containers-storage.conf.5.md @@ -38,6 +38,12 @@ The `storage` table supports the following options: container storage graph dir (default: "/var/lib/containers/storage") Default directory to store all writable content created by container storage programs. The rootless graphroot path supports environment variable substitutions (ie. `$HOME/containers/storage`) + When changing the graphroot location on an SELINUX system, ensure + the labeling matches the default locations labels with the + following commands: + + # semanage fcontext -a -e /var/lib/containers/storage /NEWSTORAGEPATH + # restorecon -R -v /NEWSTORAGEPATH **rootless_storage_path**="$HOME/.local/share/containers/storage" Storage path for rootless users. By default the graphroot for rootless users diff --git a/containers-transports.5.md b/containers-transports.5.md index c23d487..6c94d0a 100644 --- a/containers-transports.5.md +++ b/containers-transports.5.md @@ -1,4 +1,4 @@ -% CONTAINERS-TRANSPORTS(5) Containers Transports Man Page +% CONTAINERS-TRANSPORTS 5 Containers Transports Man Page % Valentin Rothberg % April 2019 diff --git a/storage.conf b/storage.conf index 9cc45a1..2afb9b0 100644 --- a/storage.conf +++ b/storage.conf @@ -11,8 +11,14 @@ driver = "overlay" runroot = "/run/containers/storage" # Primary Read/Write location of container storage +# When changing the graphroot location on an SELINUX system, you must +# ensure the labeling matches the default locations labels with the +# following commands: +# semanage fcontext -a -e /var/lib/containers/storage /NEWSTORAGEPATH +# restorecon -R -v /NEWSTORAGEPATH graphroot = "/var/lib/containers/storage" + # Storage path for rootless users # # rootless_storage_path = "$HOME/.local/share/containers/storage"