Commit 6fa48c0f authored by Fabio Luchetti's avatar Fabio Luchetti
Browse files

refine/simplify ubuntu dockerfiles

parent 80a916af
Pipeline #2735621 skipped with stage
......@@ -55,14 +55,12 @@ RUN apt install -y python2.7 python-pip
# particular stable branch. For the moment, we force install the version we want
# Priority >= 1000 causes a version to be installed even if this constitutes a downgrade of the package
RUN curl -sL http://storage-ci.web.cern.ch/storage-ci/storageci.key | apt-key add - \
&& apt-get update \
&& 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 \
&& 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 $(lsb_release -sc) release"
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
elif [ "${EOS_CODENAME}" = "citrine" ]; then export XRDVERSIONPIN=4.12.8; \
else echo "Error: EOS_CODENAME:'${EOS_CODENAME}' not supported, exiting" && exit -1; fi \
&& echo "Package: xrootd* libxrd* libxrootd*\nPin: version ${XRDVERSIONPIN}\nPin-Priority: 1000" > /etc/apt/preferences.d/xrootd.pref
# Create local repo from eos artifacts
......@@ -74,9 +72,9 @@ RUN cd ${EOSREPODIR} \
&& gzip --keep -9 Packages \
&& echo "deb [trusted=yes] file:${EOSREPODIR} ./\n" >> /etc/apt/sources.list
RUN apt-get clean \
&& apt-get update \
&& apt-get install -y eos-client eos-fuse eos-fusex eos-test eos-testkeytab
RUN apt-get update \
&& apt-get install -y eos-client eos-fuse eos-fusex eos-test eos-testkeytab \
&& apt-get clean
# sss keytabs needs to be 400
RUN chmod 400 /etc/eos.client.keytab
......
......@@ -61,14 +61,12 @@ RUN apt-get install -y curl python2 \
# particular stable branch. For the moment, we force install the version we want
# Priority >= 1000 causes a version to be installed even if this constitutes a downgrade of the package
RUN curl -sL http://storage-ci.web.cern.ch/storage-ci/storageci.key | apt-key add - \
&& apt-get update \
&& 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 \
&& 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 $(lsb_release -sc) release"
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
elif [ "${EOS_CODENAME}" = "citrine" ]; then export XRDVERSIONPIN=4.12.8; \
else echo "Error: EOS_CODENAME:'${EOS_CODENAME}' not supported, exiting" && exit -1; fi \
&& echo "Package: xrootd* libxrd* libxrootd*\nPin: version ${XRDVERSIONPIN}\nPin-Priority: 1000" > /etc/apt/preferences.d/xrootd.pref
# Create local repo from eos artifacts
......@@ -80,9 +78,9 @@ RUN cd ${EOSREPODIR} \
&& gzip --keep -9 Packages \
&& echo "deb [trusted=yes] file:${EOSREPODIR} ./\n" >> /etc/apt/sources.list
RUN apt-get clean \
&& apt-get update \
&& apt-get install -y eos-client eos-fuse eos-fusex eos-test eos-testkeytab
RUN apt-get update \
&& apt-get install -y eos-client eos-fuse eos-fusex eos-test eos-testkeytab \
&& apt-get clean
# sss keytabs needs to be 400
RUN chmod 400 /etc/eos.client.keytab
......
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