Merge pull request #618 from Cray-HPE/feature/CASMPET-7102

CASMPET-7102 Address CentOS 8 Stream EOL changes
Cray-HPE · Jun 11, 2024 · 83b8f15 · 83b8f15
2 parents 51bca1c + b49cd4f
commit 83b8f15
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/quay.io.ceph.ceph.v17.2.6.yaml b/.github/workflows/quay.io.ceph.ceph.v17.2.6.yaml
@@ -30,7 +30,7 @@ on:
  push:
  paths:
  - .github/workflows/quay.io.ceph.ceph.v17.2.6.yaml
- - quay.io.ceph.ceph.v17.2.6/**
+ - quay.io/ceph/ceph/v17.2.6/**
  workflow_dispatch:
 jobs:
  build:

diff --git a/quay.io/ceph/ceph/v16.2.13/Dockerfile b/quay.io/ceph/ceph/v16.2.13/Dockerfile
@@ -1,7 +1,7 @@
 #
 # MIT License
 #
-# (C) Copyright [2023] Hewlett Packard Enterprise Development LP
+# (C) Copyright 2023-2024 Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,12 +21,12 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 #
-
-# Generated with: make add IMAGE=ceph/ceph:v16.2.13 REGISTRY=quay.io PACKAGE_MANAGER=yum
-# DO NOT EDIT THIS FILE DIRECTLY
 FROM quay.io/ceph/ceph:v16.2.13
 
-RUN yum install -y yum-plugin-versionlock\
+# CentOS Stream 8 reached EOL and moved to http://vault.centos.org
+RUN sed -i -e 's|mirrorlist=http://mirrorlist.centos.org/|#mirrorlist=http://mirrorlist.centos.org/|' /etc/yum.repos.d/* \
+ && sed -i -e 's|#baseurl=http://mirror.centos.org/|baseurl=http://vault.centos.org/|' /etc/yum.repos.d/* \
+ && yum install -y yum-plugin-versionlock\
  && yum versionlock ceph*\
  && yum versionlock python3-ceph*\
  && yum versionlock libceph*\

diff --git a/quay.io/ceph/ceph/v17.2.6/Dockerfile b/quay.io/ceph/ceph/v17.2.6/Dockerfile
@@ -1,7 +1,7 @@
 #
 # MIT License
 #
-# (C) Copyright [2022] Hewlett Packard Enterprise Development LP
+# (C) Copyright 2022,2024 Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -21,12 +21,12 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 #
-
-# Generated with: make add IMAGE=ceph/ceph:v17.2.6 REGISTRY=quay.io PACKAGE_MANAGER=yum
-# DO NOT EDIT THIS FILE DIRECTLY
 FROM quay.io/ceph/ceph:v17.2.6
 
-RUN yum install -y yum-plugin-versionlock\
+# CentOS Stream 8 reached EOL and moved to http://vault.centos.org
+RUN sed -i -e 's|mirrorlist=http://mirrorlist.centos.org/|#mirrorlist=http://mirrorlist.centos.org/|' /etc/yum.repos.d/* \
+ && sed -i -e 's|#baseurl=http://mirror.centos.org/|baseurl=http://vault.centos.org/|' /etc/yum.repos.d/* \
+ && yum install -y yum-plugin-versionlock\
  && yum versionlock ceph*\
  && yum versionlock python3-ceph*\
  && yum versionlock libceph*\
@@ -37,5 +37,5 @@ RUN yum install -y yum-plugin-versionlock\
  && yum versionlock librgw*\
  && yum versionlock python3-rados*\
  && yum versionlock librados*\
- 
+
 RUN yum -y upgrade && yum clean all
diff --git a/quay.io/cephcsi/cephcsi/v3.6.2/Dockerfile b/quay.io/cephcsi/cephcsi/v3.6.2/Dockerfile
@@ -25,7 +25,10 @@ FROM quay.io/cephcsi/cephcsi:v3.6.2
 
 RUN dnf config-manager --disable tcmu-runner,tcmu-runner-noarch,tcmu-runner-source
 
-RUN yum -y install yum-plugin-versionlock\
+# CentOS Stream 8 reached EOL and moved to http://vault.centos.org
+RUN sed -i -e 's|mirrorlist=http://mirrorlist.centos.org/|#mirrorlist=http://mirrorlist.centos.org/|' /etc/yum.repos.d/* \
+ && sed -i -e 's|#baseurl=http://mirror.centos.org/|baseurl=http://vault.centos.org/|' /etc/yum.repos.d/* \
+ && yum -y install yum-plugin-versionlock\
  && yum versionlock ceph*\
  && yum versionlock python3-ceph*\
  && yum versionlock libceph*\