containers-common-2:1-2

- bump configs to latest versions
- replace ubi9 references with ubi8
- Related: #1970747

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

002-rhel-shortnames-overrides.conf

@@ -1,10 +1,10 @@
 [aliases]
-"skopeo"  = "registry.access.redhat.com/ubi9/skopeo"
-"ubi9/skopeo" = "registry.access.redhat.com/ubi9/skopeo"
+"skopeo"  = "registry.access.redhat.com/ubi8/skopeo"
+"ubi8/skopeo" = "registry.access.redhat.com/ubi8/skopeo"
 "rhel9/skopeo" = "registry.redhat.io/rhel9/skopeo"
-"buildah" = "registry.access.redhat.com/ubi9/buildah"
-"ubi9/buildah" = "registry.access.redhat.com/ubi9/buildah"
+"buildah" = "registry.access.redhat.com/ubi8/buildah"
+"ubi8/buildah" = "registry.access.redhat.com/ubi8/buildah"
 "rhel9/buildah" = "registry.redhat.io/rhel9/buildah"
-"podman" = "registry.access.redhat.com/ubi9/podman"
-"ubi9/podman" = "registry.access.redhat.com/ubi9/podman"
+"podman" = "registry.access.redhat.com/ubi8/podman"
+"ubi8/podman" = "registry.access.redhat.com/ubi8/podman"
 "rhel9/podman" = "registry.redhat.io/rhel9/podman"

containers-common.spec

@@ -3,17 +3,17 @@
 # These vendored components must have the same version. If it is not the case,
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
-%global skopeo_branch release-1.4
-%global podman_branch v3.3
-%global image_branch v5.15.0
-%global common_branch v0.42.0
-%global storage_branch v1.33.1
+%global skopeo_branch v1.4.0
+%global podman_branch v3.3-0-rc3
+%global image_branch v5.15.2
+%global common_branch v0.42.1
+%global storage_branch v1.34.1
 %global shortnames_branch main
 
 Epoch: 2
 Name: containers-common
 Version: 1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
@@ -161,6 +161,11 @@ EOF
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Fri Aug 20 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1-2
+- bump configs to latest versions
+- replace ubi9 references with ubi8
+- Related: #1970747
+
 * Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-1
 - initial import
 - Related: #1970747

containers.conf

@@ -368,7 +368,7 @@ events_logger = "file"
 # reserving the pods resources for the lifetime of the pod.
 #
 #infra_image = "k8s.gcr.io/pause:3.4.1"
-infra_image = "registry.access.redhat.com/ubi9/pause"
+infra_image = "registry.access.redhat.com/ubi8/pause"
 
 # Specify the locking mechanism to use; valid values are "shm" and "file".
 # Change the default only if you are sure of what you are doing, in general

shortnames.conf

@@ -56,7 +56,7 @@
   # Ubuntu
   "ubuntu" = "docker.io/library/ubuntu"
   # Oracle Linux
-  "oraclelinux" = "docker.io/library/oraclelinux"
+  "oraclelinux" = "container-registry.oracle.com/os/oraclelinux"
   # busybox
   "busybox" = "docker.io/library/busybox"
   # php

update.sh

@@ -33,7 +33,7 @@ ensure containers.conf runtime                       \"runc\"
 else
 ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"quay.io\",\ \"docker.io\"]
 ensure registries.conf short-name-mode               \"enforcing\"
-ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi9/pause\"
+ensure containers.conf infra_image                   \"registry.access.redhat.com/ubi8/pause\"
 ensure containers.conf runtime                       \"crun\"
 fi
 [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \