From 76776b611595a0f33775e122e2fb62e827f20618 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 14 Jun 2021 11:44:39 +0200 Subject: [PATCH] skopeo-1.3.0-4.el9 - add missing containers-mounts.conf.5.md file to git - don't list/install the same doc twice - Related: #1970747 Signed-off-by: Jindrich Novy --- containers-mounts.conf.5.md | 16 ++++++++++++++++ skopeo.spec | 9 ++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 containers-mounts.conf.5.md diff --git a/containers-mounts.conf.5.md b/containers-mounts.conf.5.md new file mode 100644 index 0000000..74492c8 --- /dev/null +++ b/containers-mounts.conf.5.md @@ -0,0 +1,16 @@ +% containers-mounts.conf(5) + +## NAME +containers-mounts.conf - configuration file for default mounts in containers + +## DESCRIPTION +The mounts.conf file specifies volume mount directories that are automatically mounted inside containers. Container processes can then use this content. Usually these directories are used for passing secrets or credentials required by the package software to access remote package repositories. Note that for security reasons, tools adhering to the mounts.conf are expected to copy the contents instead of bind mounting the paths from the host. + +## FORMAT +The format of the mounts.conf is the volume format `/SRC:/DEST`, one mount per line. For example, a mounts.conf with the line `/usr/share/secrets:/run/secrets` would cause the contents of the `/usr/share/secrets` directory on the host to be mounted on the `/run/secrets` directory inside the container. Setting mountpoints allows containers to use the files of the host, for instance, to use the host's subscription to some enterprise Linux distribution. + +## FILES +Some distributions may provide a `/usr/share/containers/mounts.conf` file to provide default mounts, but users can create a `/etc/containers/mounts.conf`, to specify their own special volumes to mount in the container. When Podman runs in rootless mode, the file `$HOME/.config/containers/mounts.conf` will override the default if it exists. + +## HISTORY +Aug 2018, Originally compiled by Valentin Rothberg diff --git a/skopeo.spec b/skopeo.spec index 2bb5435..ccd302d 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -30,7 +30,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 1 Name: skopeo Version: 1.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -59,7 +59,6 @@ Source14: https://raw.githubusercontent.com/containers/common/%{common_branch}/d Source15: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-auth.json.5.md Source16: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.conf.d.5.md Source17: https://raw.githubusercontent.com/containers/shortnames/%{shortnames_branch}/shortnames.conf -Source18: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.conf.5.md Source19: 001-rhel-shortnames-pyxis.conf Source20: 002-rhel-shortnames-overrides.conf # scripts used for synchronization with upstream and shortname generation @@ -162,7 +161,6 @@ go-md2man -in %{SOURCE9} -out %{buildroot}%{_mandir}/man5/containers-signature.5 go-md2man -in %{SOURCE10} -out %{buildroot}%{_mandir}/man5/containers-transports.5 go-md2man -in %{SOURCE11} -out %{buildroot}%{_mandir}/man5/containers-certs.d.5 go-md2man -in %{SOURCE12} -out %{buildroot}%{_mandir}/man5/containers-registries.d.5 -go-md2man -in %{SOURCE18} -out %{buildroot}%{_mandir}/man5/containers-registries.conf.d.5 go-md2man -in %{SOURCE14} -out %{buildroot}%{_mandir}/man5/containers.conf.5 go-md2man -in %{SOURCE15} -out %{buildroot}%{_mandir}/man5/containers-auth.json.5 go-md2man -in %{SOURCE16} -out %{buildroot}%{_mandir}/man5/containers-registries.conf.d.5 @@ -243,6 +241,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Mon Jun 14 2021 Jindrich Novy - 1:1.3.0-4 +- add missing containers-mounts.conf.5.md file to git +- don't list/install the same doc twice +- Related: #1970747 + * Mon Jun 14 2021 Jindrich Novy - 1:1.3.0-3 - update to new versions of vendored components - fail is there is an issue in communication with Pyxis API