Skip to content

Commit

Permalink
Switch xrootd source in prod container from osg-testing repo to osg
Browse files Browse the repository at this point in the history
Things in osg-testing started breaking, and I crave stability in this wild,
uncertain world. Let's go back to installing xrootd from the `osg` repos
and remember a time when life was simpler.

Doing so seems to fix the prod container's inability to build xrdcl-pelican
due to CMake errors complaining about bad function overrides.
  • Loading branch information
jhiemstrawisc committed Aug 7, 2024
1 parent 3c65a6b commit cebf8c4
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,8 @@ RUN groupadd -o -g 10940 xrootd
RUN useradd -o -u 10940 -g 10940 -s /bin/sh xrootd

# Install dependencies
# FIXME: We install xrootd from the osg-test repo to incorporate patch for the throttle plugin
# We should come back and remove it once xrootd 5.7.0 is released
RUN yum -y update \
&& yum -y --allowerasing --enablerepo osg-testing install tini xrootd xrootd-client xrdcl-http xrootd-server xrootd-scitokens xrootd-voms xrootd-multiuser curl java-17-openjdk-headless \
&& yum -y --allowerasing install tini xrootd xrootd-client xrdcl-http xrootd-server xrootd-scitokens xrootd-voms xrootd-multiuser curl java-17-openjdk-headless \
&& yum clean all \
&& rm -rf /var/cache/yum/

Expand All @@ -59,7 +57,7 @@ RUN yum -y update \
####
FROM dependency-build AS xrootd-plugin-builder
# Install necessary build dependencies
RUN yum install -y --enablerepo=osg-testing xrootd-devel xrootd-server-devel xrootd-client-devel curl-devel openssl-devel git cmake3 gcc-c++ sqlite-devel
RUN yum install -y xrootd-devel xrootd-server-devel xrootd-client-devel curl-devel openssl-devel git cmake3 gcc-c++ sqlite-devel

# The ADD command with a api.github.com URL in the next couple of sections
# are for cache-hashing of the external repository that we rely on to build
Expand Down

0 comments on commit cebf8c4

Please sign in to comment.