Skip to content

Commit

Permalink
Merge pull request PelicanPlatform#1857 from matyasselmeci/pr/xrdcl-p…
Browse files Browse the repository at this point in the history
…elican-rpm.1592

Install xrdcl-pelican from osg-testing instead of building it from source
  • Loading branch information
jhiemstrawisc authored Jan 7, 2025
2 parents f81bcc5 + 853b5a8 commit ca7bce0
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,9 @@ RUN yum install -y --enablerepo=osg-testing xrootd-devel xrootd-server-devel xr
# the image
ADD https://api.github.com/repos/PelicanPlatform/xrdcl-pelican/git/refs/heads/main /tmp/hash-xrdcl-pelican

# Install xrdcl-pelican plugin and replace the xrdcl-http plugin
# Ping the xrdcl-pelican plugin at a specific commit
# Install xrdcl-pelican plugin
RUN \
git clone https://github.com/PelicanPlatform/xrdcl-pelican.git && \
cd xrdcl-pelican && \
git checkout v0.9.4 && \
mkdir build && cd build && \
cmake -DLIB_INSTALL_DIR=/usr/lib64 -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && \
make && make install
yum install -y --enablerepo=osg-testing xrdcl-pelican

ADD https://api.github.com/repos/PelicanPlatform/xrootd-s3-http/git/refs/heads/main /tmp/hash-xrootd-s3-http

Expand Down Expand Up @@ -179,7 +173,7 @@ ENV JAVA_HOME=/usr/lib/jvm/jre \
PATH="${ST_HOME}/bin:${QDL_HOME}/bin:${PATH}"

# Copy xrdcl-pelican plugin config
COPY --from=xrootd-plugin-builder /usr/local/etc/xrootd/client.plugins.d/pelican-plugin.conf /etc/xrootd/client.plugins.d/pelican-plugin.conf
COPY --from=xrootd-plugin-builder /etc/xrootd/client.plugins.d/pelican-plugin.conf /etc/xrootd/client.plugins.d/pelican-plugin.conf
# Remove http plugin to use pelican plugin
RUN rm -f /etc/xrootd/client.plugins.d/xrdcl-http-plugin.conf

Expand Down

0 comments on commit ca7bce0

Please sign in to comment.