Fix docker image for centos9 and build requirements (#43)

Signed-off-by: galal-hussein <[email protected]>
k3s-io · May 2, 2023 · a8398fb · a8398fb
1 parent 62fc4da
commit a8398fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Dockerfile.centos9.dapper b/Dockerfile.centos9.dapper
@@ -1,7 +1,5 @@
-FROM centos:8
+FROM quay.io/centos/centos:stream9
 
-RUN find /etc/yum.repos.d -type f -name '*.repo' -exec \
-    sed -i -e '/mirrorlist.*/d' -e 's%#baseurl=http://mirror.centos.org%baseurl=http://vault.centos.org%g' {} \;
 RUN yum install -y epel-release \
  && yum -y install container-selinux git rpm-build selinux-policy-devel yum-utils
 

diff --git a/policy/centos9/k3s-selinux.spec b/policy/centos9/k3s-selinux.spec
@@ -17,7 +17,7 @@
 
 %define selinux_policyver 3.14.3-67
 %define container_policyver 2.167.0-1
-%define container_policyver_max 2.191.0-1
+%define container_policyver_max 2.211.0-1
 %define container_policy_epoch 3
 
 Name:   k3s-selinux
@@ -32,14 +32,14 @@ Source0:	k3s.pp
 Source1:	k3s.if
 
 BuildArch: noarch
-BuildRequires: container-selinux >= %{container_policy_epoch}:%{container_policyver}, container-selinux < %{container_policy_epoch}:%{container_policyver_max}
+BuildRequires: container-selinux >= %{container_policy_epoch}:%{container_policyver}, container-selinux <= %{container_policy_epoch}:%{container_policyver_max}
 BuildRequires: git
 BuildRequires: selinux-policy >= %{selinux_policyver}
 BuildRequires: selinux-policy-devel >= %{selinux_policyver}
 
 Requires: policycoreutils, libselinux-utils
 Requires(post): selinux-policy-base >= %{selinux_policyver}, policycoreutils
-Requires(post): container-selinux >= %{container_policy_epoch}:%{container_policyver}, container-selinux < %{container_policy_epoch}:%{container_policyver_max}
+Requires(post): container-selinux >= %{container_policy_epoch}:%{container_policyver}, container-selinux <= %{container_policy_epoch}:%{container_policyver_max}
 Requires(postun): policycoreutils
 
 Provides: %{name} = %{version}-%{release}