Merge pull request #164 from cs3org/xroot-cs9

xrootd build on Alma9
cs3org · Oct 31, 2024 · d366e87 · d366e87
2 parents 3198389 + 3521193
commit d366e87
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/docker/etc/epel8.repo b/docker/etc/epel8.repo
diff --git a/docker/etc/epel9.repo b/docker/etc/epel9.repo
@@ -0,0 +1,8 @@
+[epel]
+name=Extra Packages for Enterprise Linux 9 [HEAD]
+baseurl=http://linuxsoft.cern.ch/epel/9/Everything/x86_64
+enabled=1
+gpgcheck=1
+gpgkey=http://linuxsoft.cern.ch/epel/RPM-GPG-KEY-EPEL-9
+exclude=collectd*,libcollectd*,mcollective,perl-Authen-Krb5,perl-Collectd,puppet
+priority=20
diff --git a/docker/etc/xrootd.repo b/docker/etc/xrootd.repo
diff --git a/wopiserver-xrootd.Dockerfile b/wopiserver-xrootd.Dockerfile
@@ -3,7 +3,7 @@
 # Build: WOPI_DOCKER_TYPE=-xrootd docker-compose -f wopiserver.yaml build --build-arg VERSION=`git describe | sed 's/^v//'` wopiserver
 # Run: docker-compose -f wopiserver.yaml up -d
 
-FROM cern/alma8-base:latest
+FROM cern/alma9-base:latest
 
 ARG VERSION=latest
 
@@ -22,8 +22,9 @@ RUN yum clean all && yum -y install \
         python3-pip \
         python3-devel \
         openssl-devel \
-        xrootd-client-5.5.5-1.el8 \
-        xrootd-devel-5.5.5-1.el8 \
+        zlib-devel \
+        xrootd-client \
+        xrootd-devel \
         libuuid-devel \
         cmake \
         make \
@@ -32,7 +33,7 @@ RUN yum clean all && yum -y install \
 
 RUN pip3 install --upgrade pip setuptools && \
     pip3 install --upgrade flask pyOpenSSL PyJWT requests more_itertools prometheus-flask-exporter wheel
-RUN pip3 --default-timeout=900 install "xrootd==5.5.5"
+RUN pip3 --default-timeout=900 install "xrootd"
 
 # install software
 RUN mkdir -p /app/core /app/bridge /test /etc/wopi /var/log/wopi