pool/libcontainers-common
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 880685 from devel:kubic

Browse Source 
- Reintroduce SLE specific mounts config, to avoid errors on non-SLE systems

OBS-URL: https://build.opensuse.org/request/show/880685
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=33
This commit is contained in:
Richard Brown 2021-03-29 16:21:19 +00:00 committed by Git OBS Bridge
parent 8d4fff34a6
commit adbc1611ca
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcontainers-common.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 23 09:39:45 UTC 2021 - Richard Brown <rbrown@suse.com>
- Reintroduce SLE specific mounts config, to avoid errors on non-SLE systems
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 4 18:14:43 UTC 2021 - Richard Brown <rbrown@suse.com> Thu Mar 4 18:14:43 UTC 2021 - Richard Brown <rbrown@suse.com>

9
libcontainers-common.spec
View File

@ -91,6 +91,15 @@ go-md2man -in docs/source/markdown/containers-mounts.conf.5.md -out docs/source/
go-md2man -in pkg/hooks/docs/oci-hooks.5.md -out pkg/hooks/docs/oci-hooks.5 go-md2man -in pkg/hooks/docs/oci-hooks.5.md -out pkg/hooks/docs/oci-hooks.5
cd .. cd ..
%if 0%{?is_opensuse}
# no default mounts
%else
cat >>%{SOURCE5} <<EOL
/etc/SUSEConnect:/etc/SUSEConnect
/etc/zypp/credentials.d/SCCcredentials:/etc/zypp/credentials.d/SCCcredentials
EOL
%endif
cd common-%{commonver} cd common-%{commonver}
make docs make docs
cd .. cd ..

2
mounts.conf
View File

@ -1,5 +1,3 @@
# This configuration file specifies the default mounts for each container of the # This configuration file specifies the default mounts for each container of the
# tools adhering to this file (e.g., CRI-O, Podman, Buildah). The format of the # tools adhering to this file (e.g., CRI-O, Podman, Buildah). The format of the
# config is /SRC:/DST, one mount per line. # config is /SRC:/DST, one mount per line.
/etc/SUSEConnect:/etc/SUSEConnect
/etc/zypp/credentials.d/SCCcredentials:/etc/zypp/credentials.d/SCCcredentials