Skip to content

Commit

Permalink
build(docker): fix XRootD repository location (#95)
Browse files Browse the repository at this point in the history
The CERN storage team repository from which the XRootD packages were
installed has temporarily moved its URL location from "debian" to
"old_debian", with plans to move it back. This fix therefore attempts to
recognise both URLs so that the builds would work regardless of where
the repository is hosted.
  • Loading branch information
tiborsimko committed Jun 3, 2024
1 parent 572a83f commit 69fea32
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,13 @@ RUN apt-get update -y && \
vim-tiny && \
# Install xrootd
if echo "$TARGETARCH" | grep -q "amd64"; then \
(echo "deb [arch=amd64] http://storage-ci.web.cern.ch/storage-ci/debian/xrootd/ focal release" | tee -a /etc/apt/sources.list.d/xrootd.list && \
(if curl -o /dev/null -Isw '%{http_code}' https://storage-ci.web.cern.ch/storage-ci/debian/xrootd/dists/focal/Release | grep -q 200; then \
echo "deb [arch=amd64] http://storage-ci.web.cern.ch/storage-ci/debian/xrootd/ focal release" | tee -a /etc/apt/sources.list.d/xrootd.list; \
elif curl -o /dev/null -Isw '%{http_code}' https://storage-ci.web.cern.ch/storage-ci/old_debian/xrootd/dists/focal/Release | grep -q 200; then \
echo "deb [arch=amd64] http://storage-ci.web.cern.ch/storage-ci/old_debian/xrootd/ focal release" | tee -a /etc/apt/sources.list.d/xrootd.list; \
else \
echo "[ERROR] Cannot find XRootD package repository location. Exiting."; exit 1; \
fi && \
curl -sL http://storage-ci.web.cern.ch/storage-ci/storageci.key | apt-key add - && \
apt-get update -y && \
apt-get install -y --no-install-recommends \
Expand Down

0 comments on commit 69fea32

Please sign in to comment.