From 086cd969840cc94bc3d1295cc6e7b033a12432b4 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 14 Mar 2023 16:53:19 +0100
Subject: [PATCH] containers-common-1-38.el8

- update vendored components and configuration files
- Related: #2176055

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
---
 .gitignore             |  9 +--------
 Containerfile.5.md     |  6 +++++-
 containers-common.spec | 10 +++++++---
 gating.yaml            |  6 ++++++
 shortnames.conf        |  8 +++++++-
 update.sh              |  2 +-
 6 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 gating.yaml

diff --git a/.gitignore b/.gitignore
index 6cdfa89..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-SOURCES/aardvark-dns-v1.0.3-a92337b.tar.gz
-SOURCES/aardvark-dns-v1.0.3-vendor.tar.gz
-SOURCES/netavark-v1.0.3-ec7efb8.tar.gz
-SOURCES/netavark-v1.0.3-vendor.tar.gz
-/aardvark-dns-v1.0.3-a92337b.tar.gz
-/aardvark-dns-v1.0.3-vendor.tar.gz
-/netavark-v1.0.3-ec7efb8.tar.gz
-/netavark-v1.0.3-vendor.tar.gz
+/*.tar.gz
diff --git a/Containerfile.5.md b/Containerfile.5.md
index 141e99d..90226bc 100644
--- a/Containerfile.5.md
+++ b/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/containers-common.spec b/containers-common.spec
index 64f6f96..ea3eb7b 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -12,7 +12,7 @@
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 36%{?dist}
+Release: 38%{?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: 36%{?dist}
+Release: 38%{?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: 36%{?dist}
+Release: 38%{?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 Mar 14 2023 Jindrich Novy <jnovy@redhat.com> - 2:1-38
+- update vendored components and configuration files
+- Related: #2176055
+
 * Tue Oct 18 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-36
 - update vendored components and configuration files
 - Related: #2129766
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..dfc23d3
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+# recipients: jnovy, lsm5, santiago
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules: []
diff --git a/shortnames.conf b/shortnames.conf
index 4dfba37..2009c4c 100644
--- a/shortnames.conf
+++ b/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/update.sh b/update.sh
index 2e83bac..0166428 100755
--- a/update.sh
+++ b/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
 }