From 9a5fb619010b3e2fda23f85df8e7ce457d8d4400 Mon Sep 17 00:00:00 2001 From: Praveen M Date: Tue, 4 Jun 2024 10:54:29 +0530 Subject: [PATCH] ci: update centos stream 8 baseurl Since CentOS Stream 8 is EOL, this commit updates the config to use vault.centos.org for CentOS Stream 8. This should be removed once the base image (ceph) is updated to a version with a newer CentOS. Signed-off-by: Praveen M (cherry picked from commit 5809628523cd8b68d010fd84a3e95cf0e3832394) --- deploy/cephcsi/image/Dockerfile | 10 ++++++++-- scripts/Dockerfile.devel | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/deploy/cephcsi/image/Dockerfile b/deploy/cephcsi/image/Dockerfile index 741b67168..0dd5fe92f 100644 --- a/deploy/cephcsi/image/Dockerfile +++ b/deploy/cephcsi/image/Dockerfile @@ -4,8 +4,14 @@ ARG BASE_IMAGE FROM ${BASE_IMAGE} as updated_base -# TODO: remove the following cmd, when issue -# https://github.com/ceph/ceph-container/issues/2034 is fixed. +# Since CentOS Stream 8 is EOL, update the config to use vault.centos.org for CentOS Stream 8 +# TODO: remove once https://github.com/ceph/ceph-csi/issues/4659 is fixed. +RUN sed -i 's|^mirrorlist=|#mirrorlist=|g' /etc/yum.repos.d/*.repo && \ + sed -i 's|^#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/*.repo + +# TODO: remove the following cmd, when issues +# https://github.com/ceph/ceph-container/issues/2034 +# https://github.com/ceph/ceph-container/issues/2141 are fixed. RUN dnf config-manager --disable \ tcmu-runner,tcmu-runner-source,tcmu-runner-noarch,ceph-iscsi || true diff --git a/scripts/Dockerfile.devel b/scripts/Dockerfile.devel index 99ad3114c..5f5f81d93 100644 --- a/scripts/Dockerfile.devel +++ b/scripts/Dockerfile.devel @@ -1,6 +1,11 @@ ARG BASE_IMAGE FROM ${BASE_IMAGE} +# Since CentOS Stream 8 is EOL, update the config to use vault.centos.org for CentOS Stream 8 +# TODO: remove once https://github.com/ceph/ceph-csi/issues/4659 is fixed. +RUN sed -i 's|^mirrorlist=|#mirrorlist=|g' /etc/yum.repos.d/*.repo && \ + sed -i 's|^#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/*.repo + ARG GOROOT=/usr/local/go ARG GOARCH