Skip to content

GitLab

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

Slim images size; Drop ubuntu disco Dockerfile; Drop 'ENV DEBIAN_FRONTEND... 

Slim images size; Drop ubuntu disco Dockerfile; Drop 'ENV DEBIAN_FRONTEND noninteractive' in ubuntu bionic Dockerfile"
parent 166a3c0c
Pipeline #1509048 skipped with stage
Hide whitespace changes
Inline Side-by-side
Dockerfile
View file @ aa05cb0f
......@@ -35,7 +35,8 @@ RUN yum -y --nogpg install \
git parallel compat-libf2c-34 libgfortran \
gdb gcc-c++ cmake3 libacl-devel perl-Test-Harness \
rpm-build bzip2 automake autoconf libtool sudo vim \
centos-release-scl-rh at
centos-release-scl-rh at \
&& yum clean all
# Install new EOS from created repo - the ADD command will reset the docker cache,
# and any commands after that point will be uncached.
......@@ -48,7 +49,8 @@ RUN createrepo ${EOSREPODIR}; \
yum -y --nogpg install quarkdb grid-hammer davix; \
yum -y --nogpg install \
eos-server eos-testkeytab eos-archive eos-client \
eos-debuginfo eos-fuse eos-fusex eos-test eos-ns-inspect
eos-debuginfo eos-fuse eos-fusex eos-test eos-ns-inspect \
&& yum clean all
# *************
# NOTE: !UGLY!*
......
Dockerfile_asan
View file @ aa05cb0f
......@@ -31,7 +31,8 @@ RUN yum -y --nogpg install \
git parallel compat-libf2c-34 libgfortran \
gdb gcc-c++ cmake3 libacl-devel perl-Test-Harness \
rpm-build bzip2 automake autoconf libtool sudo vim \
centos-release-scl-rh at
centos-release-scl-rh at \
&& yum clean all
# Install new EOS from created repo - the ADD command will reset the docker cache,
# and any commands after that point will be uncached.
......@@ -41,7 +42,8 @@ ADD cc7_asan_artifacts ${EOSREPODIR}
# Special packages, must be installed un-cached.
RUN createrepo ${EOSREPODIR}; \
echo -e "[eos-asan-artifacts]\nname=EOS Asan artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos-artifacts.repo; \
yum install --nogpg --disablerepo="cern*" -y eos-client eos-server eos-test eos-ns-inspect quarkdb
yum install --nogpg --disablerepo="cern*" -y eos-client eos-server eos-test eos-ns-inspect quarkdb \
&& yum clean all
# Generate a new forwardable keytab 'eos-test+' to replace the not-forwardable one (installed by the eos-testkeytab package).
# This is useful to deploy EOS on Kubernetes clusters running on CERN's Cloud Infrastructure; you can remove these lines if you don't need one.
......
Dockerfile_c8
View file @ aa05cb0f
......@@ -29,7 +29,8 @@ RUN dnf -y install epel-release; \
krb5-server krb5-workstation createrepo initscripts \
rsync sqlite less nano sudo vim at bzip2 git parallel \
rpm-build libgfortran libacl-devel perl-Test-Harness \
gcc-c++ gdb cmake automake autoconf libtool
gcc-c++ gdb cmake automake autoconf libtool \
&& dnf clean all
# Install EOS from locally created repo
# Note: the ADD command will reset the docker cache
......@@ -43,7 +44,8 @@ RUN createrepo ${EOSREPODIR}; \
dnf -y --nogpg install quarkdb davix; \
dnf -y --nogpg install \
eos-server eos-testkeytab eos-client eos-ns-inspect \
eos-fuse eos-fusex eos-test eos-debuginfo
eos-fuse eos-fusex eos-test eos-debuginfo \
&& dnf clean all
# *************
# NOTE: !UGLY!*
......
Dockerfile_coverage
View file @ aa05cb0f
......@@ -31,7 +31,8 @@ RUN yum -y --nogpg install \
git parallel compat-libf2c-34 libgfortran \
gdb gcc-c++ cmake3 libacl-devel perl-Test-Harness \
rpm-build bzip2 automake autoconf libtool sudo vim \
lcov centos-release-scl-rh
lcov centos-release-scl-rh \
&& yum clean all
# Install devtoolset-6
RUN yum -y --nogpg install devtoolset-6
......@@ -48,7 +49,8 @@ RUN createrepo ${EOSREPODIR}; \
yum -y --nogpg install quarkdb grid-hammer davix; \
yum -y --nogpg install \
eos-server eos-testkeytab eos-archive eos-client \
eos-fuse eos-fusex eos-debuginfo eos-test eos-coverage
eos-fuse eos-fusex eos-debuginfo eos-test eos-coverage \
&& yum clean all
# Setup environment for coverage profiling
ADD eos-docker/coverage/image/ /eos-coverage/
......
Dockerfile_ubuntu_bionic
View file @ aa05cb0f
......@@ -20,7 +20,7 @@ ADD eos-docker/fstfmd.dict /var/eos/md/
RUN mkdir /var/tmp/eosxd-cache/ /var/tmp/eosxd-journal/
RUN useradd eos-user
ENV DEBIAN_FRONTEND noninteractive
#ENV DEBIAN_FRONTEND noninteractive
RUN apt-get install -y software-properties-common
RUN apt-get install -y --no-install-recommends apt-utils
RUN apt-get install -y build-essential git gdebi-core \
......
Dockerfile_ubuntu_disco deleted 100644 → 0
View file @ 166a3c0c
#
# Simple EOS Docker file
#
# Version 0.1
FROM ubuntu:disco
MAINTAINER Mihai Patrascoiu, mihai.patrascoiu@cern.ch, CERN 2019
RUN apt-get update
# Add helper scripts
ADD eos-docker/image_scripts/*.sh /
# Add configuration files for EOS instance
ADD eos-docker/eos.sysconfig /etc/sysconfig/eos
ADD eos-docker/xrd.cf.* eos-docker/krb5.conf /etc/
ADD eos-docker/fuse.conf /etc/eos/fuse.mount-1.conf
ADD eos-docker/fuse.conf /etc/eos/fuse.mount-2.conf
ADD eos-docker/fstfmd.dict /var/eos/md/
RUN mkdir /var/tmp/eosxd-cache/ /var/tmp/eosxd-journal/
RUN useradd eos-user
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get install -y software-properties-common
RUN apt-get install -y --no-install-recommends apt-utils
RUN apt-get install -y build-essential git gdebi-core \
heimdal-servers krb5-kdc krb5-admin-server \
krb5-user libpam-krb5 libpam-ccreds libtool \
nano vim parallel gcc gdb g++ fort77 gfortran-8 perl \
bzip2 automake autoconf wget curl \
cmake createrepo cpio sqlite3 rsync at
# Add XRootd repo
RUN curl -sL http://storage-ci.web.cern.ch/storage-ci/storageci.key | apt-key add - && apt-get update
RUN echo "deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd disco release\n# deb-src http://storage-ci.web.cern.ch/storage-ci/debian/xrootd disco release" >> /etc/apt/sources.list
RUN add-apt-repository 'deb http://storage-ci.web.cern.ch/storage-ci/debian/xrootd disco release'
# Create local repo from eos artifacts
ENV EOSREPODIR="/debs/eos/"
ADD disco_artifacts ${EOSREPODIR}
RUN cd ${EOSREPODIR}; \
dpkg-scanpackages . > Packages; \
gzip --keep -9 Packages
RUN echo "deb [trusted=yes] file:${EOSREPODIR} ./\n" >> /etc/apt/sources.list
RUN apt-get clean && apt-get update
RUN apt-get install -y eos-client eos-fuse eos-fusex eos-test eos-testkeytab
# Change persmissions for keytab
RUN chown daemon:daemon /etc/eos.keytab; \
chmod 400 /etc/eos.keytab
ENTRYPOINT ["/bin/bash"]
Dockerfile_xrd_testing
View file @ aa05cb0f
......@@ -30,12 +30,14 @@ RUN yum -y --nogpg install \
createrepo initscripts less nano \
git parallel compat-libf2c-34 libgfortran \
gdb gcc-c++ cmake3 libacl-devel perl-Test-Harness \
rpm-build bzip2 automake autoconf libtool sudo vim at
rpm-build bzip2 automake autoconf libtool sudo vim at \
&& yum clean all
# Special packages, must be installed un-cached.
RUN yum clean all; \
yum -y --nogpg --enablerepo=xrootd-testing --setopt="eos-depend.exclude=xrootd*" install \
quarkdb grid-hammer davix
quarkdb grid-hammer davix \
&& yum clean all
# Install new EOS from created repo - the ADD command will reset the docker cache,
# and any commands after that point will be uncached.
......@@ -46,7 +48,8 @@ RUN createrepo ${EOSREPODIR}; \
echo -e "[eos-artifacts]\nname=EOS artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos.repo; \
yum -y --nogpg --enablerepo=xrootd-testing --setopt="eos-depend.exclude=xrootd*,python2-xrootd*" install \
eos-server eos-testkeytab eos-archive eos-client \
eos-debuginfo eos-fuse eos-fusex eos-test eos-ns-inspect
eos-debuginfo eos-fuse eos-fusex eos-test eos-ns-inspect \
&& yum clean all
# Generate a new forwardable keytab 'eos-test+' to replace the not-forwardable one (installed by the eos-testkeytab package).
# This is useful to deploy EOS on Kubernetes clusters running on CERN's Cloud Infrastructure; you can remove these lines if you don't need one.
......
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