From a4a5b790128bcc5f53565ee8edd54921916713d6 Mon Sep 17 00:00:00 2001 From: James Adams Date: Tue, 2 Jun 2020 11:45:23 +0100 Subject: [PATCH] Return to installing latest version of Singularity Now that the wLCG baseline has been updated to 3.5.2. --- docker-c6/Dockerfile | 4 +--- docker-c7/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/docker-c6/Dockerfile b/docker-c6/Dockerfile index 48ca321..ec2abaa 100644 --- a/docker-c6/Dockerfile +++ b/docker-c6/Dockerfile @@ -46,9 +46,7 @@ RUN yummy boost-date-time boost-filesystem boost-graph boost-iostreams boost-pro boost-thread boost-wave # Singularity -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 +RUN yummy singularity singularity-runtime # 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 76f214f..5fe9e03 100644 --- a/docker-c7/Dockerfile +++ b/docker-c7/Dockerfile @@ -36,9 +36,7 @@ RUN yummy boost-date-time boost-filesystem boost-graph boost-iostreams boost-pro boost-thread boost-wave # Singularity -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 +RUN yummy singularity singularity-runtime # Disable overlay and loop device management in singularity RUN sed -i '/enable overlay/c\enable overlay = no' /etc/singularity/singularity.conf && \