Commit d0bb3b92 authored by Fabio Luchetti's avatar Fabio Luchetti
Browse files

In ubuntu dockerfiles, pin the right xrootd version depending if building for...

In ubuntu dockerfiles, pin the right xrootd version depending if building for eos diopside or eos citrine
parent e1d8ce07
Pipeline #2734694 skipped with stage
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
FROM ubuntu:bionic FROM ubuntu:bionic
LABEL maintainer="Fabio Luchetti faluchet@cern.ch, CERN 2020" LABEL maintainer="Fabio Luchetti faluchet@cern.ch, CERN 2020"
ARG EOS_CODENAME
RUN apt-get update RUN apt-get update
# Add helper scripts # Add helper scripts
...@@ -57,7 +59,11 @@ RUN curl -sL http://storage-ci.web.cern.ch/storage-ci/storageci.key | apt-key ad ...@@ -57,7 +59,11 @@ RUN curl -sL http://storage-ci.web.cern.ch/storage-ci/storageci.key | apt-key ad
&& echo "deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd bionic release" >> /etc/apt/sources.list \ && echo "deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd bionic release" >> /etc/apt/sources.list \
&& echo "deb-src http://storage-ci.web.cern.ch/storage-ci/debian/xrootd bionic release" >> /etc/apt/sources.list \ && echo "deb-src http://storage-ci.web.cern.ch/storage-ci/debian/xrootd bionic release" >> /etc/apt/sources.list \
&& add-apt-repository 'deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd bionic release' \ && add-apt-repository 'deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd bionic release' \
&& echo "Package: xrootd* libxrd* libxrootd*\nPin: version 4.12.8\nPin-Priority: 1000" > /etc/apt/preferences.d/xrootd.pref
RUN if [ "${EOS_CODENAME}" == "diopside" ]; then export XRDVERSIONPIN=5.2.0; \
elif [ "${EOS_CODENAME}" == "citrine" ]; then export XRDVERSIONPIN=4.12.8; fi \
&& echo -e "Package: xrootd* libxrd* libxrootd*\nPin: version ${XRDVERSIONPIN}\nPin-Priority: 1000" > /etc/apt/preferences.d/xrootd.pref
# Create local repo from eos artifacts # Create local repo from eos artifacts
ENV EOSREPODIR="/debs/eos/" ENV EOSREPODIR="/debs/eos/"
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
FROM ubuntu:focal FROM ubuntu:focal
LABEL maintainer="Fabio Luchetti faluchet@cern.ch, CERN 2020" LABEL maintainer="Fabio Luchetti faluchet@cern.ch, CERN 2020"
ARG EOS_CODENAME
RUN apt-get update RUN apt-get update
# Add helper scripts # Add helper scripts
...@@ -62,8 +64,12 @@ RUN curl -sL http://storage-ci.web.cern.ch/storage-ci/storageci.key | apt-key ad ...@@ -62,8 +64,12 @@ RUN curl -sL http://storage-ci.web.cern.ch/storage-ci/storageci.key | apt-key ad
&& apt-get update \ && apt-get update \
&& echo "deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd focal release" >> /etc/apt/sources.list \ && echo "deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd focal release" >> /etc/apt/sources.list \
&& echo "deb-src http://storage-ci.web.cern.ch/storage-ci/debian/xrootd focal release" >> /etc/apt/sources.list \ && echo "deb-src http://storage-ci.web.cern.ch/storage-ci/debian/xrootd focal release" >> /etc/apt/sources.list \
&& add-apt-repository 'deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd focal release' \ && add-apt-repository 'deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd focal release'
&& echo "Package: xrootd* libxrd* libxrootd*\nPin: version 4.12.8\nPin-Priority: 1000" > /etc/apt/preferences.d/xrootd.pref
RUN if [ "${EOS_CODENAME}" == "diopside" ]; then export XRDVERSIONPIN=5.2.0; \
elif [ "${EOS_CODENAME}" == "citrine" ]; then export XRDVERSIONPIN=4.12.8; fi \
&& echo -e "Package: xrootd* libxrd* libxrootd*\nPin: version ${XRDVERSIONPIN}\nPin-Priority: 1000" > /etc/apt/preferences.d/xrootd.pref
# Create local repo from eos artifacts # Create local repo from eos artifacts
ENV EOSREPODIR="/debs/eos/" ENV EOSREPODIR="/debs/eos/"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment