Merge pull request #13 from jrha/heposlibs

Update to latest versions of HEP OSlibs
stfc · Jul 2, 2019 · 35cfb8d · 35cfb8d
2 parents cc1e86f + 16f0655
commit 35cfb8d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git 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
 
@@ -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 \
@@ -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
@@ -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
 
@@ -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
@@ -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 && \