Skip to content

Commit d366e87

Browse files
authored
Merge pull request #164 from cs3org/xroot-cs9
xrootd build on Alma9
2 parents 3198389 + 3521193 commit d366e87

File tree

4 files changed

+13
-18
lines changed

4 files changed

+13
-18
lines changed

docker/etc/epel8.repo

-8
This file was deleted.

docker/etc/epel9.repo

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[epel]
2+
name=Extra Packages for Enterprise Linux 9 [HEAD]
3+
baseurl=http://linuxsoft.cern.ch/epel/9/Everything/x86_64
4+
enabled=1
5+
gpgcheck=1
6+
gpgkey=http://linuxsoft.cern.ch/epel/RPM-GPG-KEY-EPEL-9
7+
exclude=collectd*,libcollectd*,mcollective,perl-Authen-Krb5,perl-Collectd,puppet
8+
priority=20

docker/etc/xrootd.repo

-6
This file was deleted.

wopiserver-xrootd.Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Build: WOPI_DOCKER_TYPE=-xrootd docker-compose -f wopiserver.yaml build --build-arg VERSION=`git describe | sed 's/^v//'` wopiserver
44
# Run: docker-compose -f wopiserver.yaml up -d
55

6-
FROM cern/alma8-base:latest
6+
FROM cern/alma9-base:latest
77

88
ARG VERSION=latest
99

@@ -22,8 +22,9 @@ RUN yum clean all && yum -y install \
2222
python3-pip \
2323
python3-devel \
2424
openssl-devel \
25-
xrootd-client-5.5.5-1.el8 \
26-
xrootd-devel-5.5.5-1.el8 \
25+
zlib-devel \
26+
xrootd-client \
27+
xrootd-devel \
2728
libuuid-devel \
2829
cmake \
2930
make \
@@ -32,7 +33,7 @@ RUN yum clean all && yum -y install \
3233

3334
RUN pip3 install --upgrade pip setuptools && \
3435
pip3 install --upgrade flask pyOpenSSL PyJWT requests more_itertools prometheus-flask-exporter wheel
35-
RUN pip3 --default-timeout=900 install "xrootd==5.5.5"
36+
RUN pip3 --default-timeout=900 install "xrootd"
3637

3738
# install software
3839
RUN mkdir -p /app/core /app/bridge /test /etc/wopi /var/log/wopi

0 commit comments

Comments
 (0)