use rhel docker-containerd packages for rhel/containerd/rocky 8, not …

…centos (#5560) * use rhel docker-containerd packages for rhel/containerd/rocky 8, not centos * fix rhel8 version of containerd 1.6.33 too
replicatedhq · Feb 12, 2025 · b0ad695 · b0ad695
1 parent b877e8e
commit b0ad695
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/addons/containerd/1.6.33/Manifest b/addons/containerd/1.6.33/Manifest
@@ -3,7 +3,7 @@ yum container-selinux
 asset runc https://github.com/opencontainers/runc/releases/download/v1.2.4/runc.amd64
 dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.33
 dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.33
-dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.32
+dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.33
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.6.33
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
 dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.6.33

diff --git a/addons/containerd/1.7.25/Manifest b/addons/containerd/1.7.25/Manifest
@@ -3,7 +3,7 @@ yum container-selinux
 asset runc https://github.com/opencontainers/runc/releases/download/v1.2.4/runc.amd64
 dockerout rhel-7 addons/containerd/template/Dockerfile.centos7 1.6.33
 dockerout rhel-7-force addons/containerd/template/Dockerfile.centos7-force 1.6.33
-dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.6.32
+dockerout rhel-8 addons/containerd/template/Dockerfile.centos8 1.7.25
 dockerout rhel-9 addons/containerd/template/Dockerfile.rhel9 1.7.25
 dockerout ubuntu-18.04 addons/containerd/template/Dockerfile.ubuntu18 1.6.21
 dockerout ubuntu-20.04 addons/containerd/template/Dockerfile.ubuntu20 1.7.25

diff --git a/addons/containerd/template/Dockerfile.centos8 b/addons/containerd/template/Dockerfile.centos8
@@ -4,7 +4,7 @@ RUN echo -e "fastestmirror=1\nmax_parallel_downloads=8" >> /etc/dnf/dnf.conf
 
 RUN yum install -y yum-utils epel-release createrepo
 RUN yum install -y modulemd-tools
-RUN yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
+RUN yum-config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo
 RUN mkdir -p /packages/archives
 
 ARG VERSION