Skip to content

Commit

Permalink
Merge pull request PelicanPlatform#1022 from haoming29/build-fixed-xr…
Browse files Browse the repository at this point in the history
…d-http

Pin external c++ dependencies at a specific commit
  • Loading branch information
jhiemstrawisc authored Apr 2, 2024
2 parents 529f5f3 + f1683f2 commit ad8eac2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions images/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ RUN yum install -y xrootd-devel xrootd-server-devel xrootd-client-devel curl-de
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
RUN \
git clone https://github.com/PelicanPlatform/xrdcl-pelican.git && \
cd xrdcl-pelican && \
git reset 9562795 --hard && \
mkdir build && cd build && \
cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \
make && make install
Expand All @@ -76,9 +78,11 @@ ADD https://api.github.com/repos/PelicanPlatform/xrootd-s3-http/git/refs/heads/m

# Install the S3 and HTTP server plugins for XRootD. For now we do this from source
# until we can sort out the RPMs.
# Ping the http plugin at a specific commit
RUN \
git clone https://github.com/PelicanPlatform/xrootd-s3-http.git && \
cd xrootd-s3-http && \
git reset a0eb944 --hard && \
mkdir build && cd build && \
cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \
make install
Expand All @@ -98,9 +102,11 @@ RUN git clone https://github.com/pboettch/json-schema-validator.git && \
cd build && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
make -j`nproc` install
#Finally LotMan proper. For now we do this from source until we can sort out the RPMs.
#Ping LotMan at a specific commit
RUN \
git clone https://github.com/PelicanPlatform/lotman.git && \
cd lotman && \
git reset 2dd3738 --hard && \
mkdir build && cd build && \
# LotMan CMakeLists.txt needs to be updated to use -DLIB_INSTALL_DIR. Issue #6
cmake -DCMAKE_INSTALL_PREFIX=/usr .. && \
Expand Down
6 changes: 6 additions & 0 deletions images/dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ RUN yum install -y goreleaser npm xrootd-devel xrootd-server-devel xrootd-client
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
RUN \
git clone https://github.com/PelicanPlatform/xrdcl-pelican.git && \
cd xrdcl-pelican && \
git reset 9562795 --hard && \
mkdir build && cd build && \
cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \
make && make install
Expand All @@ -98,9 +100,11 @@ ADD https://api.github.com/repos/PelicanPlatform/xrootd-s3-http/git/refs/heads/m

# Install the S3 and HTTP server plugins for XRootD. For now we do this from source
# until we can sort out the RPMs.
# Ping the http plugin at a specific commit
RUN \
git clone https://github.com/PelicanPlatform/xrootd-s3-http.git && \
cd xrootd-s3-http && \
git reset a0eb944 --hard && \
mkdir build && cd build && \
cmake -DLIB_INSTALL_DIR=/usr/lib64 .. && \
make install
Expand All @@ -120,9 +124,11 @@ RUN git clone https://github.com/pboettch/json-schema-validator.git && \
cd build && cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=/usr .. && \
make -j`nproc` install
#Finally LotMan proper. For now we do this from source until we can sort out the RPMs.
#Ping LotMan at a specific commit
RUN \
git clone https://github.com/PelicanPlatform/lotman.git && \
cd lotman && \
git reset 2dd3738 --hard && \
mkdir build && cd build && \
# LotMan CMakeLists.txt needs to be updated to use -DLIB_INSTALL_DIR. Issue #6
cmake -DCMAKE_INSTALL_PREFIX=/usr .. && \
Expand Down

0 comments on commit ad8eac2

Please sign in to comment.