From 8ddb615df28f5b9dabfb92fad12565206813a04c Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Wed, 16 Oct 2024 09:44:34 +0200 Subject: [PATCH] build: no need to use the CentOS 8 archived repositories on CentOS 9 The Ceph base container-image moved to CentOS Stream 9, so there is no need to adapt the repositories anymore. Closes: #4659 Signed-off-by: Niels de Vos --- deploy/cephcsi/image/Dockerfile | 5 ----- scripts/Dockerfile.devel | 5 ----- 2 files changed, 10 deletions(-) diff --git a/deploy/cephcsi/image/Dockerfile b/deploy/cephcsi/image/Dockerfile index 552e8273d91..52c2462cf2a 100644 --- a/deploy/cephcsi/image/Dockerfile +++ b/deploy/cephcsi/image/Dockerfile @@ -4,11 +4,6 @@ ARG BASE_IMAGE FROM ${BASE_IMAGE} as updated_base -# 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. diff --git a/scripts/Dockerfile.devel b/scripts/Dockerfile.devel index eb2ab723a4d..8ecbd243224 100644 --- a/scripts/Dockerfile.devel +++ b/scripts/Dockerfile.devel @@ -1,11 +1,6 @@ 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