Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use rhel docker-containerd packages for rhel/containerd/rocky 8, not centos #5560

Merged
merged 2 commits into from
Feb 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/containerd/1.6.33/Manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/containerd/1.7.25/Manifest
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/containerd/template/Dockerfile.centos8
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading