update xrootd container os to rocky8 and upgrade xrootd version to 5.…

…6.9-2
stfc · May 1, 2024 · db000bf · db000bf
1 parent ee6c151
commit db000bf
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 78 deletions.
diff --git a/xrootd/Dockerfile b/xrootd/Dockerfile
@@ -1,6 +1,6 @@
-FROM centos:7
-ARG XROOTD_VERSION=5.6.3-1
-ARG XRDCEPH_VERSION=5.5.4-3
+FROM rockylinux:8
+ARG XROOTD_VERSION=5.6.9-2
+ARG XRDCEPH_VERSION=5.6.4-1
 ARG CEPH_VERSION=14.2.22-0
 LABEL xrootd-ver=$XROOTD_VERSION
 LABEL xrdceph-ver=$XRDCEPH_VERSION
@@ -14,76 +14,76 @@ RUN groupadd --gid 65432 xrootd && \
 COPY *.repo /etc/yum.repos.d/
 
 # install versionlock, and configure versionlocks
-RUN yum -y install yum-versionlock
-RUN yum -y versionlock add ceph-${CEPH_VERSION}.el7.x86_64 \
-                           ceph-base-${CEPH_VERSION}.el7.x86_64 \
-                           ceph-common-${CEPH_VERSION}.el7.x86_64 \
-                           ceph-mds-${CEPH_VERSION}.el7.x86_64 \
-                           ceph-mgr-${CEPH_VERSION}.el7.x86_64 \
-                           ceph-mon-${CEPH_VERSION}.el7.x86_64 \
-                           ceph-osd-${CEPH_VERSION}.el7.x86_64 \
-                           ceph-selinux-${CEPH_VERSION}.el7.x86_64 \
-                           libcephfs2-${CEPH_VERSION}.el7.x86_64 \
-                           librados2-${CEPH_VERSION}.el7.x86_64 \
-                           libradosstriper1-${CEPH_VERSION}.el7.x86_64 \
-                           librbd1-${CEPH_VERSION}.el7.x86_64 \
-                           librgw2-${CEPH_VERSION}.el7.x86_64 \
-                           python-ceph-argparse-${CEPH_VERSION}.el7.x86_64 \
-                           python-cephfs-${CEPH_VERSION}.el7.x86_64 \
-                           python-rados-${CEPH_VERSION}.el7.x86_64 \
-                           python-rbd-${CEPH_VERSION}.el7.x86_64 \
-                           python-rgw-${CEPH_VERSION}.el7.x86_64 \
-                           python3-ceph-argparse-${CEPH_VERSION}.el7.x86_64 \
-                           python3-cephfs-${CEPH_VERSION}.el7.x86_64 \
-                           python3-rados-${CEPH_VERSION}.el7.x86_64 \
-                           python3-rbd-${CEPH_VERSION}.el7.x86_64 \
-                           python3-rgw-${CEPH_VERSION}.el7.x86_64 \
-                           xrootd-${XROOTD_VERSION}.el7.x86_64 \
-                           xrootd-client-${XROOTD_VERSION}.el7.x86_64 \
-                           xrootd-client-libs-${XROOTD_VERSION}.el7.x86_64 \
-                           xrootd-libs-${XROOTD_VERSION}.el7.x86_64 \
-                           xrootd-selinux-${XROOTD_VERSION}.el7.noarch \
-                           xrootd-server-${XROOTD_VERSION}.el7.x86_64 \
-                           xrootd-server-libs-${XROOTD_VERSION}.el7.x86_64 \
-                           xrootd-ceph-buffered-${XRDCEPH_VERSION}.el7.x86_64 \
-                           xrootd-voms-${XROOTD_VERSION}.el7.x86_64
+RUN dnf -y install python3-dnf-plugin-versionlock
+RUN dnf -y versionlock add ceph-${CEPH_VERSION}.el8.x86_64 \
+                           ceph-base-${CEPH_VERSION}.el8.x86_64 \
+                           ceph-common-${CEPH_VERSION}.el8.x86_64 \
+                           ceph-mds-${CEPH_VERSION}.el8.x86_64 \
+                           ceph-mgr-${CEPH_VERSION}.el8.x86_64 \
+                           ceph-mon-${CEPH_VERSION}.el8.x86_64 \
+                           ceph-osd-${CEPH_VERSION}.el8.x86_64 \
+                           ceph-selinux-${CEPH_VERSION}.el8.x86_64 \
+                           libcephfs2-${CEPH_VERSION}.el8.x86_64 \
+                           librados2-${CEPH_VERSION}.el8.x86_64 \
+                           libradosstriper1-${CEPH_VERSION}.el8.x86_64 \
+                           librbd1-${CEPH_VERSION}.el8.x86_64 \
+                           librgw2-${CEPH_VERSION}.el8.x86_64 \
+                           python-ceph-argparse-${CEPH_VERSION}.el8.x86_64 \
+                           python-cephfs-${CEPH_VERSION}.el8.x86_64 \
+                           python-rados-${CEPH_VERSION}.el8.x86_64 \
+                           python-rbd-${CEPH_VERSION}.el8.x86_64 \
+                           python-rgw-${CEPH_VERSION}.el8.x86_64 \
+                           python3-ceph-argparse-${CEPH_VERSION}.el8.x86_64 \
+                           python3-cephfs-${CEPH_VERSION}.el8.x86_64 \
+                           python3-rados-${CEPH_VERSION}.el8.x86_64 \
+                           python3-rbd-${CEPH_VERSION}.el8.x86_64 \
+                           python3-rgw-${CEPH_VERSION}.el8.x86_64 \
+                           xrootd-${XROOTD_VERSION}.el8.x86_64 \
+                           xrootd-client-${XROOTD_VERSION}.el8.x86_64 \
+                           xrootd-client-libs-${XROOTD_VERSION}.el8.x86_64 \
+                           xrootd-libs-${XROOTD_VERSION}.el8.x86_64 \
+                           xrootd-selinux-${XROOTD_VERSION}.el8.noarch \
+                           xrootd-server-${XROOTD_VERSION}.el8.x86_64 \
+                           xrootd-server-libs-${XROOTD_VERSION}.el8.x86_64 \
+                           xrootd-ceph-buffered-${XRDCEPH_VERSION}.el8.x86_64 \
+                           xrootd-voms-${XROOTD_VERSION}.el8.x86_64
 
-RUN yum -y versionlock list
+RUN dnf -y versionlock list
 
 
 # Ceph
-RUN yum -y install ceph \
+RUN dnf -y install ceph \
                    ceph-common
 
 # xrootd
-RUN yum -y install xrootd-ceph-buffered \
+RUN dnf -y install xrootd-ceph-buffered \
                    xrootd-client \
                    xrootd-client-libs \
                    xrootd-libs \
                    xrootd-server \
                    xrootd-server-libs \
                    xrootd-voms \
+                   xrootd-ceph-ckslib \
                    jemalloc
 
 
 # For N2N mapping
-RUN yum -y install http://repos.gridpp.rl.ac.uk/yum/xrootd-cmstfc/el7/xrootd-cmstfc-1.5.2-6.osgup.el7.x86_64.rpm
-
+RUN dnf -y install http://repos.gridpp.rl.ac.uk/yum/xrootd-cmstfc/el8/xrootd-cmstfc-1.5.2-6.osgroup.el8.x86_64.rpm
 # Needed by the health-check scripts
-RUN yum -y install openssl
+RUN dnf -y install openssl
 
 # python3 needed for cephsum script
-RUN yum -y install xrd-cephsum \
+RUN dnf -y install xrd-cephsum \
                    python3 \
                    python3-rados
 
 # Install netcat for service healthcheck
-RUN yum -y install netcat
+RUN dnf -y install netcat
 
 # Update & cleanup
-RUN yum -y update && \
-                   yum clean all && \
-                   rm -rf /var/cache/yum
+RUN dnf -y update && \
+                   dnf clean all && \
+                   rm -rf /var/cache/dnf
 
 # Bake healthcheck script
 COPY xrootd-healthcheck.sh .

diff --git a/xrootd/ceph-el7-x86_64.repo b/xrootd/ceph-el7-x86_64.repo
diff --git a/xrootd/ceph-el8-x86_64.repo b/xrootd/ceph-el8-x86_64.repo
@@ -0,0 +1,8 @@
+[ceph-el8-x86_64]
+name = ceph-el8-x86_64
+baseurl = http://mirrors.gridpp.rl.ac.uk/current/ceph-el8-x86_64/RPMS.nautilus/
+metadata_expire = 7d
+enabled = 1
+gpgcheck = 0
+priority = 40
+skip_if_unavailable = 0
diff --git a/xrootd/epel-7-x86_64.repo → xrootd/epel-8-x86_64.repo b/xrootd/epel-7-x86_64.repo → xrootd/epel-8-x86_64.repo
@@ -1,6 +1,6 @@
-[epel-7-x86_64]
-name = epel-7-x86_64
-baseurl = http://mirrors.gridpp.rl.ac.uk/current/epel-7-x86_64/RPMS.base/
+[epel-8-x86_64]
+name = epel-8-x86_64
+baseurl = http://mirrors.gridpp.rl.ac.uk/current/epel-8-x86_64/RPMS.base/
 metadata_expire = 7d
 exclude = *ceph* librados* librbd* librgw* python-rados python-rbd rbd-fuse rbd-mirror rbd-nbd xrootd*
 enabled = 1

diff --git a/xrootd/tier1-el8-local.repo b/xrootd/tier1-el8-local.repo
@@ -0,0 +1,9 @@
+[tier1-el8-local]
+name=tier1-el8-local
+baseurl=    http://repos.gridpp.rl.ac.uk/yum/local/el8/
+
+metadata_expire=7d
+enabled=1
+gpgcheck=0
+priority=30
+skip_if_unavailable=0
diff --git a/xrootd/tier1-sl7-local.repo b/xrootd/tier1-sl7-local.repo
diff --git a/xrootd/xrootd-ceph-el7-x86_64.repo → xrootd/xrootd-ceph-el8-x86_64.repo b/xrootd/xrootd-ceph-el7-x86_64.repo → xrootd/xrootd-ceph-el8-x86_64.repo
@@ -1,6 +1,6 @@
-[xrootd-ceph-el7-x86_64]
-name = xrootd-ceph-el7-x86_64
-baseurl = http://repos.gridpp.rl.ac.uk/yum/xrootd-ceph/nautilus/el7/x86_64/
+[xrootd-ceph-el8-x86_64]
+name = xrootd-ceph-el8-x86_64
+baseurl = http://repos.gridpp.rl.ac.uk/yum/xrootd-ceph/nautilus/el8/x86_64/
 metadata_expire = 7d
 enabled = 1
 gpgcheck = 0

diff --git a/xrootd/xrootd-el7-x86_64.repo b/xrootd/xrootd-el7-x86_64.repo
diff --git a/xrootd/xrootd-el8-x86_64.repo b/xrootd/xrootd-el8-x86_64.repo
@@ -0,0 +1,8 @@
+[xrootd-el8-x86_64]
+name = xrootd-el8-x86_64
+baseurl = http://mirrors.gridpp.rl.ac.uk/current/xrootd-el8-x86_64/RPMS.xrootd-org/
+metadata_expire = 7d
+enabled = 1
+gpgcheck = 0
+priority = 30
+skip_if_unavailable = 0