From d745b5b236c0a7371b15290f72ac874be243facd Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 16 2023 06:09:07 +0000
Subject: import containers-common-1-37.module+el8.8.0+17954+9046de88


---

diff --git a/SOURCES/Containerfile.5.md b/SOURCES/Containerfile.5.md
index 141e99d..90226bc 100644
--- a/SOURCES/Containerfile.5.md
+++ b/SOURCES/Containerfile.5.md
@@ -118,7 +118,7 @@ Current supported mount TYPES are bind, cache, secret and tmpfs.
 
               · dst, destination, target: mount destination spec.
 
-              · ro, read-only: true or false (default).
+              · ro, read-only: true (default) or false.
 
        Options specific to bind:
 
@@ -128,6 +128,8 @@ Current supported mount TYPES are bind, cache, secret and tmpfs.
 
               · from: stage or image name for the root of the source. Defaults to the build context.
 
+              · rw, read-write: allows writes on the mount.
+
        Options specific to tmpfs:
 
               · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux.
@@ -150,6 +152,8 @@ Current supported mount TYPES are bind, cache, secret and tmpfs.
 
               · from: stage name for the root of the source. Defaults to host cache directory.
 
+              · rw, read-write: allows writes on the mount.
+
 
 **RUN Secrets**
 
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/SOURCES/shortnames.conf b/SOURCES/shortnames.conf
index 4dfba37..2009c4c 100644
--- a/SOURCES/shortnames.conf
+++ b/SOURCES/shortnames.conf
@@ -3,7 +3,7 @@
   "almalinux" = "docker.io/library/almalinux"
   "almalinux-minimal" = "docker.io/library/almalinux-minimal"
   # Arch Linux
-  "archlinux" = "docker.io/archlinux/archlinux"
+  "archlinux" = "docker.io/library/archlinux"
   # centos
   "centos" = "quay.io/centos/centos"
   # containers
@@ -42,6 +42,10 @@
   "sles12sp5" = "registry.suse.com/suse/sles12sp5"
   "sles12sp4" = "registry.suse.com/suse/sles12sp4"
   "sles12sp3" = "registry.suse.com/suse/sles12sp3"
+  "bci/bci-base" = "registry.suse.com/bci/bci-base"
+  "bci/bci-micro" = "registry.suse.com/bci/bci-micro"
+  "bci/bci-minimal" = "registry.suse.com/bci/bci-minimal"
+  "bci/bci-busybox" = "registry.suse.com/bci/bci-busybox"
   # Red Hat Enterprise Linux
   "rhel" = "registry.access.redhat.com/rhel"
   "rhel6" = "registry.access.redhat.com/rhel6"
@@ -111,5 +115,7 @@
   "php" = "docker.io/library/php"
   # python
   "python" = "docker.io/library/python"
+  # rust
+  "rust" = "docker.io/library/rust"
   # node
   "node" = "docker.io/library/node"
diff --git a/SOURCES/update.sh b/SOURCES/update.sh
index 2e83bac..0166428 100755
--- a/SOURCES/update.sh
+++ b/SOURCES/update.sh
@@ -13,7 +13,7 @@ ensure() {
       sed -i "/^#.*$2[[:blank:]].*=/a \
 $2 = $3" $1
     else
-      echo "$2 = \"$3\"" >> $1
+      echo "$2 = $3" >> $1
     fi
   fi
 }
diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec
index 34381b2..4804ebe 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: 37%{?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: 37%{?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: 37%{?dist}
 URL: https://github.com/containers/netavark
 Summary: OCI network stack
 License: ASL 2.0 and BSD and MIT
@@ -306,6 +306,14 @@ EOF
 %{_mandir}/man1/netavark.1*
 
 %changelog
+* Wed Jan 25 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-37
+- update vendored components and configuration files
+- Related: #2129766
+
+* Tue Oct 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-36
+- update vendored components and configuration files
+- Related: #2129766
+
 * Wed Jul 13 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-35
 - update vendored components and configuration files
 - Related: #2061390