From 892e3c7cb85e81f8ebc547a3579489ea96e1180d Mon Sep 17 00:00:00 2001 From: James Adams Date: Tue, 25 Jun 2019 16:39:35 +0100 Subject: [PATCH 1/2] Fetch Singularity 2.6.1 from EPEL archive As it has now disappeared from the main repo, swap the packages around and exclude singularity from EPEL. --- docker-c6/Dockerfile | 7 ++++--- docker-c7/Dockerfile | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docker-c6/Dockerfile b/docker-c6/Dockerfile index 4b598f4..fa2189c 100644 --- a/docker-c6/Dockerfile +++ b/docker-c6/Dockerfile @@ -6,7 +6,7 @@ RUN echo -e '#!/bin/bash\nfor p in "$@"; do\nyum -y install "$p" || exit 1; done chmod u+x /usr/local/sbin/yummy && \ cat /usr/local/sbin/yummy -RUN yummy yum-priorities +RUN yummy yum-priorities yum-utils RUN yummy zip curl @@ -46,8 +46,9 @@ RUN yummy boost-date-time boost-filesystem boost-graph boost-iostreams boost-pro boost-thread boost-wave # Singularity -RUN yummy singularity-2.6.1-1.1.el6.x86_64 \ - singularity-runtime-2.6.1-1.1.el6.x86_64 +RUN yum-config-manager --setopt 'epel.exclude=singularity*' --save && \ + yummy https://archive.fedoraproject.org/pub/archive/epel/6/x86_64/Packages/s/singularity-runtime-2.6.1-1.1.el6.x86_64.rpm \ + https://archive.fedoraproject.org/pub/archive/epel/6/x86_64/Packages/s/singularity-2.6.1-1.1.el6.x86_64.rpm # Disable overlay and loop device management in singularity RUN sed -i '/enable overlay/c\enable overlay = no' /etc/singularity/singularity.conf && \ diff --git a/docker-c7/Dockerfile b/docker-c7/Dockerfile index 92623e1..fd15b10 100644 --- a/docker-c7/Dockerfile +++ b/docker-c7/Dockerfile @@ -6,7 +6,7 @@ RUN echo -e '#!/bin/bash\nfor p in "$@"; do\nyum -y install "$p" || exit 1; done chmod u+x /usr/local/sbin/yummy && \ cat /usr/local/sbin/yummy -RUN yummy yum-priorities +RUN yummy yum-priorities yum-utils RUN yummy zip curl @@ -36,8 +36,9 @@ RUN yummy boost-date-time boost-filesystem boost-graph boost-iostreams boost-pro boost-thread boost-wave # Singularity -RUN yummy singularity-2.6.1-1.1.el7.x86_64 \ - singularity-runtime-2.6.1-1.1.el7.x86_64 +RUN yum-config-manager --setopt 'epel.exclude=singularity*' --save && \ + yummy https://archive.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/s/singularity-runtime-2.6.1-1.1.el7.x86_64.rpm \ + https://archive.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/s/singularity-2.6.1-1.1.el7.x86_64.rpm # Disable overlay and loop device management in singularity RUN sed -i '/enable overlay/c\enable overlay = no' /etc/singularity/singularity.conf && \ From 16f0655f29f6abca8c5c9f9f3b57b61353ec1505 Mon Sep 17 00:00:00 2001 From: James Adams Date: Tue, 25 Jun 2019 14:48:30 +0100 Subject: [PATCH 2/2] Update to latest versions of HEP OSlibs --- docker-c6/Dockerfile | 2 +- docker-c7/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-c6/Dockerfile b/docker-c6/Dockerfile index fa2189c..48ca321 100644 --- a/docker-c6/Dockerfile +++ b/docker-c6/Dockerfile @@ -30,7 +30,7 @@ RUN yummy http://repository.egi.eu/sw/production/umd/4/sl6/x86_64/updates/umd-re RUN yummy freetype expat gcc glibc-headers compat-expat1 compat-openldap time man unzip quota attr tcsh # Install HEP_OSlibs -RUN yummy http://linuxsoft.cern.ch/wlcg/sl6/x86_64/HEP_OSlibs_SL6-1.1.5-1.el6.x86_64.rpm +RUN yummy http://linuxsoft.cern.ch/wlcg/sl6/x86_64/HEP_OSlibs_SL6-1.1.9-2.el6.x86_64.rpm # Install glexec, lcmaps & lcas RUN yummy glexec mkgltempdir \ diff --git a/docker-c7/Dockerfile b/docker-c7/Dockerfile index fd15b10..76f214f 100644 --- a/docker-c7/Dockerfile +++ b/docker-c7/Dockerfile @@ -25,7 +25,7 @@ RUN yummy https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm RUN yummy freetype expat gcc glibc-headers compat-openldap time man unzip quota attr tcsh # Install HEP_OSlibs -RUN yummy http://linuxsoft.cern.ch/wlcg/centos7/x86_64/HEP_OSlibs-7.2.6-1.el7.cern.x86_64.rpm +RUN yummy http://linuxsoft.cern.ch/wlcg/centos7/x86_64/HEP_OSlibs-7.2.10-1.el7.cern.x86_64.rpm # Machine job features RUN yummy http://quattor.web.lal.in2p3.fr/packages/machine-job-features/sl6/noarch/mjf-htcondor-00.19-1.noarch.rpm