From 6a9804cbbc7e73a3ccea577150374322218c3fd7 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 5 May 2022 09:44:41 -0400 Subject: [PATCH] 19095: Update singularity to 3.9.9 to get loopback device bugfix. https://github.com/sylabs/singularity/pull/458 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- doc/architecture/singularity.html.textile.liquid | 2 +- .../install-compute-node-singularity.html.textile.liquid | 4 ++-- lib/install/deps.go | 2 +- tools/compute-images/scripts/base.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/architecture/singularity.html.textile.liquid b/doc/architecture/singularity.html.textile.liquid index 9a82cd93d6..8ebc6f73df 100644 --- a/doc/architecture/singularity.html.textile.liquid +++ b/doc/architecture/singularity.html.textile.liquid @@ -32,4 +32,4 @@ Arvados @Singularity@ support is a work in progress. These are the current limit * Even when using the Singularity runtime, users' container images are expected to be saved in Docker format. Specifying a @.sif@ file as an image when submitting a container request is not yet supported. * Arvados' Singularity implementation does not yet limit the amount of memory available in a container. Each container will have access to all memory on the host where it runs, unless memory use is restricted by Slurm/LSF. * The Docker ENTRYPOINT instruction is ignored. -* Arvados is tested with Singularity version 3.7.4. Other versions may not work. +* Arvados is tested with Singularity version 3.9.9. Other versions may not work. diff --git a/doc/install/crunch2/install-compute-node-singularity.html.textile.liquid b/doc/install/crunch2/install-compute-node-singularity.html.textile.liquid index e61b6cbe37..cb0e3c3a4c 100644 --- a/doc/install/crunch2/install-compute-node-singularity.html.textile.liquid +++ b/doc/install/crunch2/install-compute-node-singularity.html.textile.liquid @@ -40,9 +40,9 @@ Follow the "Singularity installation instructions":https://sylabs.io/guides/3.7/ 
$ singularity version
-3.7.4
+3.9.9
 $ mksquashfs -version
-mksquashfs version 4.3-git (2014/06/09)
+mksquashfs version 4.4 (2019/08/29)
 [...]
diff --git a/lib/install/deps.go b/lib/install/deps.go index ae9327696e..cdf28e09c6 100644 --- a/lib/install/deps.go +++ b/lib/install/deps.go @@ -34,7 +34,7 @@ const goversion = "1.17.7" const ( rubyversion = "2.7.5" bundlerversion = "2.2.19" - singularityversion = "3.7.4" + singularityversion = "3.9.9" pjsversion = "1.9.8" geckoversion = "0.24.0" gradleversion = "5.3.1" diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh index 2bc41e3473..c9fd0945d2 100644 --- a/tools/compute-images/scripts/base.sh +++ b/tools/compute-images/scripts/base.sh @@ -120,7 +120,7 @@ rm -rf /var/lib/arvados/go/ curl -s https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz | tar -C /var/lib/arvados -xzf - ln -sf /var/lib/arvados/go/bin/* /usr/local/bin/ -singularityversion=3.7.4 +singularityversion=3.9.9 curl -Ls https://github.com/sylabs/singularity/archive/refs/tags/v${singularityversion}.tar.gz | tar -C /var/lib/arvados -xzf - cd /var/lib/arvados/singularity-${singularityversion} -- 2.30.2