Skip to content

Commit 90cc74e

Browse files
committed
DM-51977: mega-CMSD redirector capable of scaling up to 256 workers in Qserv
1 parent 6142752 commit 90cc74e

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

admin/tools/docker/base/Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,24 +133,19 @@ RUN cd /tmp \
133133
&& cd /tmp \
134134
&& rm -rf mysqlproxy
135135

136-
COPY xrootd_f032a1b0.patch /tmp
137-
138136
RUN cd /tmp \
139137
&& git clone https://github.com/xrootd/xrootd.git \
140138
&& cd xrootd \
141-
&& git checkout tags/v5.6.2 \
139+
&& git checkout cms256 \
142140
&& git config --global user.email "[email protected]" \
143141
&& git config --global user.name "Qserv" \
144-
&& git cherry-pick d85915a3927261e49859c3e13075bce1dfefcbe4 \
145-
&& git apply /tmp/xrootd_f032a1b0.patch \
146142
&& mkdir build \
147143
&& cd build \
148144
&& cmake -DENABLE_PYTHON=off .. \
149145
&& make -j8 \
150146
&& make install \
151147
&& cd /tmp \
152-
&& rm -rf xrootd \
153-
&& rm /tmp/xrootd_f032a1b0.patch
148+
&& rm -rf xrootd
154149

155150
RUN cd /tmp \
156151
&& git clone https://github.com/yhirose/cpp-httplib.git \

admin/tools/docker/base/xrootd_f032a1b0.patch

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)