From 733f86abf4405b11d8aa19ad5d2b5655c30e27c0 Mon Sep 17 00:00:00 2001
From: Guillaume Demonet <guillaume.demonet@scality.com>
Date: Fri, 5 Aug 2022 08:08:52 +0200
Subject: [PATCH] build,packages: Restrict runc version

The runc version 1.1.3, recently added in upstream repositories for
RHEL/Rocky 8, seems to include a bug causing issues with "exec" in
containers.
We explicitly reject this version in the RPM `Requires` line, hoping
that future versions will have this issue fixed.

See: https://github.com/containerd/containerd/issues/7219
---
 buildchain/buildchain/versions.py      |  2 +-
 packages/redhat/common/containerd.spec | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
index 8200a4b7d2..04eb01e54f 100644
--- a/buildchain/buildchain/versions.py
+++ b/buildchain/buildchain/versions.py
@@ -24,7 +24,7 @@
 CONTAINERD_VERSION: str = "1.6.4"
 
 CALICO_RELEASE: str = "1"
-CONTAINERD_RELEASE: str = "1"
+CONTAINERD_RELEASE: str = "2"
 SOSREPORT_RELEASE: str = "2"
 
 
diff --git a/packages/redhat/common/containerd.spec b/packages/redhat/common/containerd.spec
index 38180fcc1a..a55ed2724e 100644
--- a/packages/redhat/common/containerd.spec
+++ b/packages/redhat/common/containerd.spec
@@ -32,7 +32,7 @@ go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-seccomp %{!?el7:no_
 
 
 Name:           containerd
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
@@ -54,7 +54,13 @@ BuildRequires:  go-md2man
 BuildRequires:  libseccomp-devel
 BuildRequires:  systemd
 %{?systemd_requires}
-Requires:       runc
+# NOTE: A bug in runc 1.1.3 seems to cause issues with "exec" in containers
+#       See https://github.com/containerd/containerd/issues/7219
+%if 0%{?el7}
+Requires:       runc < 1.1.3
+%else
+Requires:       (runc < 1.1.3 or runc > 1.1.3)
+%endif
 
 # vendored libraries
 # From github.com/containerd/containerd repository, checkout the corresponding version and run:
@@ -549,6 +555,9 @@ install -D -p -m 0644 %{S:3} %{buildroot}%{_sysctldir}/60-containerd.conf
 
 
 %changelog
+* Fri Aug 5 2022 Guillaume Demonet <guillaume.demonet@scality.com> - 1.6.4-2
+- Constrain runc version to avoid issue with "exec"
+
 * Wed May 25 2022 Guillaume Demonet <guillaume.demonet@scality.com> - 1.6.4-1
 - Latest upstream