From 5503be21404eff485b0a15bf281d72a2488ad3de Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 12 Nov 2021 13:33:34 +0100 Subject: [PATCH] containers-common-1-11.el9 - use ubi8/pause as ubi9/pause is not available yet - Related: #2000051 Signed-off-by: Jindrich Novy --- containers-common.spec | 6 +++++- containers.conf | 2 +- update.sh | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/containers-common.spec b/containers-common.spec index 99d3923..279c127 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -12,7 +12,7 @@ Epoch: 2 Name: containers-common Version: 1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch @@ -160,6 +160,10 @@ EOF %{_datadir}/rhel/secrets/* %changelog +* Fri Nov 12 2021 Jindrich Novy - 2:1-11 +- use ubi8/pause as ubi9/pause is not available yet +- Related: #2000051 + * Wed Nov 10 2021 Jindrich Novy - 2:1-10 - update vendored components - Related: #2000051 diff --git a/containers.conf b/containers.conf index ccf84cb..154d121 100644 --- a/containers.conf +++ b/containers.conf @@ -384,7 +384,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 diff --git a/update.sh b/update.sh index 745f98b..121c12e 100755 --- a/update.sh +++ b/update.sh @@ -34,7 +34,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 \