Accepting request 721685 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/721685
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=18

default.yaml

@@ -0,0 +1,26 @@
+# This is a default registries.d configuration file.  You may
+# add to this file or create additional files in registries.d/.
+#
+# sigstore: indicates a location that is read and write
+# sigstore-staging: indicates a location that is only for write
+#
+# sigstore and sigstore-staging take a value of the following:
+#   sigstore:  {schema}://location
+#
+# For reading signatures, schema may be http, https, or file.
+# For writing signatures, schema may only be file.
+
+# This is the default signature write location for docker registries.
+default-docker:
+#  sigstore: file:///var/lib/containers/sigstore
+  sigstore-staging: file:///var/lib/containers/sigstore
+
+# The 'docker' indicator here is the start of the configuration
+# for docker registries.
+#
+# docker:
+#
+#   privateregistry.com:
+#    sigstore: http://privateregistry.com/sigstore/
+#    sigstore-staging: /mnt/nfs/privateregistry/sigstore
+

libcontainers-common.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Aug  7 10:35:07 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
+
+- Add missing licenses to spec file
+
+-------------------------------------------------------------------
+Tue Aug  6 11:42:17 UTC 2019 - Marco Vedovati <mvedovati@suse.com>
+
+- Add a default registries.d configuration file, used to specify images 
+  signatures storage location.
+
 -------------------------------------------------------------------
 Fri Aug  2 09:46:10 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
 

libcontainers-common.spec

@@ -28,7 +28,7 @@ Name:           libcontainers-common
 Version:        20190802
 Release:        0
 Summary:        Configuration files common to github.com/containers
-License:        Apache-2.0
+License:        Apache-2.0 and GPL-3.0+
 Group:          System/Management
 URL:            https://github.com/containers
 Source0:        image-%{imagever}.tar.xz
@@ -39,6 +39,7 @@ Source4:        storage.conf
 Source5:        mounts.conf
 Source6:        registries.conf
 Source7:        libpod-%{libpodver}.tar.xz
+Source8:        default.yaml
 BuildRequires:  go-go-md2man
 Provides:       libcontainers-image
 Provides:       libcontainers-storage
@@ -107,6 +108,7 @@ install -D -m 0644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/containers/storage.con
 install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/containers/mounts.conf
 install -D -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/containers/mounts.conf
 install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/containers/registries.conf
+install -D -m 0644 %{SOURCE8} %{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
 install -D -m 0644 libpod-%{libpodver}/seccomp.json %{buildroot}/%{_datadir}/containers/seccomp.json
 install -D -m 0644 libpod-%{libpodver}/seccomp.json %{buildroot}/%{_sysconfdir}/containers/seccomp.json
 
@@ -141,6 +143,7 @@ fi
 %{_datadir}/containers/mounts.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
 %config(noreplace) %{_sysconfdir}/containers/seccomp.json
+%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
 %{_datadir}/containers/seccomp.json
 
 %{_mandir}/man1/*.1%{?ext_man}