Merge pull request #16 from jrha/singularity_3

Return to installing latest version of Singularity
stfc · Jun 3, 2020 · 2341635 · 2341635
2 parents 5faed05 + a4a5b79
commit 2341635
Show file tree

Hide file tree

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