Commit 134c935d authored by Fabio Luchetti's avatar Fabio Luchetti
Browse files

use docker-native syntax to include the eos-xrootd relevant paths in the env

parent 0cba2539
Pipeline #2928652 skipped with stage
......@@ -8,6 +8,10 @@ LABEL maintainer="Elvin Sindrilaru, esindril@cern.ch, CERN 2017"
ARG EOS_CODENAME
# Expect to use eos-xrootd in running containers
ENV PATH /opt/eos/xrootd/bin:$PATH
ENV LD_LIBRARY_PATH /opt/eos/xrootd/lib64:$LD_LIBRARY_PATH
# Add extra repositories
COPY eos-docker/el-7/*.repo /etc/yum.repos.d/
......@@ -69,10 +73,6 @@ RUN createrepo ${EOSREPODIR} \
RUN if [ "${EOS_CODENAME}" != "diopside" ]; then yum -y --nogpg install quarkdb; else yum -y --nogpg install eos-quarkdb; fi
# Expect to use eos-xrootd
RUN echo "PATH=/opt/eos/xrootd/bin:\$PATH" >> /etc/profile.d/eos-xrootd.sh \
&& echo "LD_LIBRARY_PATH=/opt/eos/xrootd/lib64:\$LD_LIBRARY_PATH" >> /etc/profile.d/eos-xrootd.sh
# Change owner of /var/spool/xrootd directory to daemon
RUN chown daemon:daemon /var/spool/xrootd
......
......@@ -8,6 +8,10 @@ LABEL maintainer="Fabio Luchetti faluchet@cern.ch, CERN 2019"
ARG EOS_CODENAME
# Expect to use eos-xrootd in running containers
ENV PATH /opt/eos/xrootd/bin:$PATH
ENV LD_LIBRARY_PATH /opt/eos/xrootd/lib64:$LD_LIBRARY_PATH
# Add extra repositories
COPY eos-docker/el-7/*.repo /etc/yum.repos.d/
......@@ -70,10 +74,6 @@ RUN createrepo ${EOSREPODIR} \
RUN if [ "${EOS_CODENAME}" != "diopside" ]; then yum -y --nogpg install quarkdb; else yum -y --nogpg install eos-quarkdb; fi
# Expect to use eos-xrootd
RUN echo "PATH=/opt/eos/xrootd/bin:\$PATH" >> /etc/profile.d/eos-xrootd.sh \
&& echo "LD_LIBRARY_PATH=/opt/eos/xrootd/lib64:\$LD_LIBRARY_PATH" >> /etc/profile.d/eos-xrootd.sh
# sss keytabs needs to be 400
RUN chmod 400 /etc/eos.keytab /etc/eos.client.keytab
......
......@@ -8,6 +8,10 @@ LABEL maintainer="Mihai Patrascoiu, mihai.patrascoiu@cern.ch, CERN 2020"
ARG EOS_CODENAME
# Expect to use eos-xrootd in running containers
ENV PATH /opt/eos/xrootd/bin:$PATH
ENV LD_LIBRARY_PATH /opt/eos/xrootd/lib64:$LD_LIBRARY_PATH
# Add extra repositories
COPY eos-docker/el-8/*.repo /etc/yum.repos.d/
......@@ -78,10 +82,6 @@ RUN createrepo ${EOSREPODIR}; \
RUN if [ "${EOS_CODENAME}" != "diopside" ]; then yum -y --nogpg install quarkdb; else yum -y --nogpg install eos-quarkdb; fi
# Expect to use eos-xrootd
RUN echo "PATH=/opt/eos/xrootd/bin:\$PATH" >> /etc/profile.d/eos-xrootd.sh \
&& echo "LD_LIBRARY_PATH=/opt/eos/xrootd/lib64:\$LD_LIBRARY_PATH" >> /etc/profile.d/eos-xrootd.sh
# Change owner of /var/spool/xrootd directory to daemon
RUN chown daemon:daemon /var/spool/xrootd
......
......@@ -6,6 +6,12 @@
FROM centos:7
LABEL maintainer="Elvin Sindrilaru, esindril@cern.ch, CERN 2017"
ARG EOS_CODENAME
# Expect to use eos-xrootd in running containers
ENV PATH /opt/eos/xrootd/bin:$PATH
ENV LD_LIBRARY_PATH /opt/eos/xrootd/lib64:$LD_LIBRARY_PATH
# Add extra repositories
COPY eos-docker/el-7/*.repo /etc/yum.repos.d/
......@@ -66,10 +72,6 @@ RUN createrepo ${EOSREPODIR} \
eos-archive eos-client eos-fuse eos-fusex eos-server eos-test eos-testkeytab eos-coverage \
&& yum clean all
# Expect to use eos-xrootd
RUN echo "PATH=/opt/eos/xrootd/bin:\$PATH" >> /etc/profile.d/eos-xrootd.sh \
&& echo "LD_LIBRARY_PATH=/opt/eos/xrootd/lib64:\$LD_LIBRARY_PATH" >> /etc/profile.d/eos-xrootd.sh
# Setup environment for coverage profiling
ADD eos-docker/coverage/image/ /eos-coverage/
ENV GCOV_PREFIX="/var/eos/coverage/"
......
......@@ -10,6 +10,10 @@ LABEL maintainer="Fabio Luchetti, fabio.luchetti@cern.ch, CERN 2021"
ARG EOS_CODENAME
# Expect to use eos-xrootd in running containers
ENV PATH /opt/eos/xrootd/bin:$PATH
ENV LD_LIBRARY_PATH /opt/eos/xrootd/lib64:$LD_LIBRARY_PATH
# Add extra repositories
COPY eos-docker/el-8/*.repo /etc/yum.repos.d/
......@@ -80,10 +84,6 @@ RUN createrepo ${EOSREPODIR}; \
RUN if [ "${EOS_CODENAME}" != "diopside" ]; then yum -y --nogpg install quarkdb; else yum -y --nogpg install eos-quarkdb; fi
# Expect to use eos-xrootd
RUN echo "PATH=/opt/eos/xrootd/bin:\$PATH" >> /etc/profile.d/eos-xrootd.sh \
&& echo "LD_LIBRARY_PATH=/opt/eos/xrootd/lib64:\$LD_LIBRARY_PATH" >> /etc/profile.d/eos-xrootd.sh
# Change owner of /var/spool/xrootd directory to daemon
RUN chown daemon:daemon /var/spool/xrootd
......
......@@ -8,6 +8,10 @@ LABEL maintainer="Elvin Sindrilaru, esindril@cern.ch, CERN 2017"
ARG EOS_CODENAME
# Expect to use eos-xrootd in running containers
ENV PATH /opt/eos/xrootd/bin:$PATH
ENV LD_LIBRARY_PATH /opt/eos/xrootd/lib64:$LD_LIBRARY_PATH
# Add extra repositories
COPY eos-docker/el-7/*.repo /etc/yum.repos.d/
......@@ -73,10 +77,6 @@ RUN createrepo ${EOSREPODIR} \
RUN if [ "${EOS_CODENAME}" != "diopside" ]; then yum -y --nogpg install quarkdb; fi
# Expect to use eos-xrootd
RUN echo "PATH=/opt/eos/xrootd/bin:\$PATH" >> /etc/profile.d/eos-xrootd.sh \
&& echo "LD_LIBRARY_PATH=/opt/eos/xrootd/lib64:\$LD_LIBRARY_PATH" >> /etc/profile.d/eos-xrootd.sh
# Change owner of /var/spool/xrootd directory to daemon
RUN chown daemon:daemon /var/spool/xrootd
......
......@@ -6,6 +6,12 @@
FROM centos:7
LABEL maintainer="Elvin Sindrilaru, esindril@cern.ch, CERN 2017"
ARG EOS_CODENAME
# Expect to use eos-xrootd in running containers
ENV PATH /opt/eos/xrootd/bin:$PATH
ENV LD_LIBRARY_PATH /opt/eos/xrootd/lib64:$LD_LIBRARY_PATH
# Add extra repositories
COPY eos-docker/el-7/*.repo /etc/yum.repos.d/
......@@ -62,10 +68,6 @@ RUN createrepo ${EOSREPODIR} \
eos-archive eos-client eos-fuse eos-fusex eos-ns-inspect eos-server eos-test eos-testkeytab \
&& yum clean all
# Expect to use eos-xrootd
RUN echo "PATH=/opt/eos/xrootd/bin:\$PATH" >> /etc/profile.d/eos-xrootd.sh \
&& echo "LD_LIBRARY_PATH=/opt/eos/xrootd/lib64:\$LD_LIBRARY_PATH" >> /etc/profile.d/eos-xrootd.sh
# sss keytabs needs to be 400
RUN chmod 400 /etc/eos.keytab /etc/eos.client.keytab
......
......@@ -12,6 +12,9 @@ ARG EOS_CODENAME=citrine
# One of {commit, tag-testing, tag}
ARG REPOBRANCH=tag
# Expect to use eos-xrootd in running containers
ENV PATH /opt/eos/xrootd/bin:$PATH
ENV LD_LIBRARY_PATH /opt/eos/xrootd/lib64:$LD_LIBRARY_PATH
COPY eos-docker/minimal/el-7/epel.repo /etc/yum.repos.d/epel.repo
COPY eos-docker/minimal/el-7/eos.repo /etc/yum.repos.d/eos.repo
......@@ -27,10 +30,6 @@ RUN yum -y --nogpg install epel-release \
&& if [ "${EOS_CODENAME}" == "diopside" ]; then yum -y --nogpg install eos-quarkdb; else yum -y --nogpg install quarkdb; fi \
&& yum clean all && rm -rf /var/cache/yum
# Expect to use eos-xrootd
RUN echo "PATH=/opt/eos/xrootd/bin:\$PATH" >> /etc/profile.d/eos-xrootd.sh \
&& echo "LD_LIBRARY_PATH=/opt/eos/xrootd/lib64:\$LD_LIBRARY_PATH" >> /etc/profile.d/eos-xrootd.sh
# sss keytabs needs to be 400
RUN chmod 400 /etc/eos.keytab /etc/eos.client.keytab
......
......@@ -12,6 +12,9 @@ ARG EOS_CODENAME=citrine
# One of {commit, tag-testing, tag}
ARG REPOBRANCH=tag
# Expect to use eos-xrootd in running containers
ENV PATH /opt/eos/xrootd/bin:$PATH
ENV LD_LIBRARY_PATH /opt/eos/xrootd/lib64:$LD_LIBRARY_PATH
COPY eos-docker/minimal/el-7/epel.repo /etc/yum.repos.d/epel.repo
COPY eos-docker/minimal/el-7/eos.repo /etc/yum.repos.d/eos.repo
......@@ -24,10 +27,6 @@ RUN yum -y --nogpg install epel-release \
eos-fusex \
&& yum clean all && rm -rf /var/cache/yum
# Expect to use eos-xrootd
RUN echo "PATH=/opt/eos/xrootd/bin:\$PATH" >> /etc/profile.d/eos-xrootd.sh \
&& echo "LD_LIBRARY_PATH=/opt/eos/xrootd/lib64:\$LD_LIBRARY_PATH" >> /etc/profile.d/eos-xrootd.sh
# Install some much needed utility: please bloat with care!
RUN yum -y --nogpg install nano && yum clean all && rm -rf /var/cache/yum
......
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