diff --git a/SOURCES/default.yaml b/SOURCES/default.yaml index fa2ea36..a7f3d28 100644 --- a/SOURCES/default.yaml +++ b/SOURCES/default.yaml @@ -1,8 +1,8 @@ # This is a default registries.d configuration file. You may # add to this file or create additional files in registries.d/. # -# lookaside: indicates a location that is read and write -# lookaside-staging: indicates a location that is only for write +# lookaside: for reading/writing simple signing signatures +# lookaside-staging: for writing simple signing signatures, preferred over lookaside # # lookaside and lookaside-staging take a value of the following: # lookaside: {schema}://location @@ -10,10 +10,12 @@ # 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. +# The default locations are built-in, for both reading and writing: +# /var/lib/containers/sigstore for root, or +# ~/.local/share/containers/sigstore for non-root users. default-docker: -# lookaside: file:///var/lib/containers/sigstore - lookaside-staging: file:///var/lib/containers/sigstore +# lookaside: https://… +# lookaside-staging: file:///… # The 'docker' indicator here is the start of the configuration # for docker registries. @@ -21,6 +23,6 @@ default-docker: # docker: # # privateregistry.com: -# lookaside: http://privateregistry.com/sigstore/ +# lookaside: https://privateregistry.com/sigstore/ # lookaside-staging: /mnt/nfs/privateregistry/sigstore diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec index 34381b2..64f6f96 100644 --- a/SPECS/containers-common.spec +++ b/SPECS/containers-common.spec @@ -12,7 +12,7 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildRequires: /usr/bin/go-md2man @@ -97,7 +97,7 @@ separately. %package -n aardvark-dns Version: 1.0.1 -Release: 35%{?dist} +Release: 36%{?dist} URL: https://github.com/containers/aardvark-dns Summary: Authoritative DNS server for A/AAAA container records License: ASL 2.0 and BSD and MIT @@ -117,7 +117,7 @@ Read more about configuration in `src/backend/mod.rs`. %package -n netavark Version: 1.0.1 -Release: 35%{?dist} +Release: 36%{?dist} URL: https://github.com/containers/netavark Summary: OCI network stack License: ASL 2.0 and BSD and MIT @@ -306,6 +306,10 @@ EOF %{_mandir}/man1/netavark.1* %changelog +* Tue Oct 18 2022 Jindrich Novy - 2:1-36 +- update vendored components and configuration files +- Related: #2129766 + * Wed Jul 13 2022 Jindrich Novy - 2:1-35 - update vendored components and configuration files - Related: #2061390