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 <tom@curii.com>

diff --git a/doc/architecture/singularity.html.textile.liquid b/doc/architecture/singularity.html.textile.liquid
index 9a82cd93d60e1fdb718ae14833686369ce7d060f..8ebc6f73df6af90866f1d4f31f20968f18830a4b 100644 (file)
--- 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 e61b6cbe3783b192325b77c1454747abcc128a1e..cb0e3c3a4c02d7f31554186c3acadd23ea20ce95 100644 (file)
--- 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/
 
 <notextile>
 <pre><code>$ <span class="userinput">singularity version</span>
-3.7.4
+3.9.9
 $ <span class="userinput">mksquashfs -version</span>
-mksquashfs version 4.3-git (2014/06/09)
+mksquashfs version 4.4 (2019/08/29)
 [...]
 </code></pre>
 </notextile>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index ae9327696e029b4fa432a8fadeccc00f42037771..cdf28e09c69c23bd9259710380fdbaa8476101bf 100644 (file)
--- 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 2bc41e34737801baa2ef3862403209326a54a4a6..c9fd0945d2927157b46a0ba5bd4232f2a120b8e5 100644 (file)
--- 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}