20735: Update singularity version in docs and build script.

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 8ebc6f73df6af90866f1d4f31f20968f18830a4b..b4c3778e046afef48e996d13379bd2ca7c44b1ea 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.9.9. Other versions may not work.
+* Arvados is tested with Singularity version 3.10.4. 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 2afdf8a919150e62b3464e58b8637e6045bf4398..53a2f5bddd061ec06a2f8f8228245528fbf564f9 100644 (file)
--- a/doc/install/crunch2/install-compute-node-singularity.html.textile.liquid
+++ b/doc/install/crunch2/install-compute-node-singularity.html.textile.liquid
@@ -36,11 +36,11 @@ This page describes how to configure a compute node so that it can be used to ru
 
 h2(#singularity). Set up Singularity
 
-Follow the "Singularity installation instructions":https://sylabs.io/guides/3.9/user-guide/quick_start.html. Make sure @singularity@ and @mksquashfs@ are working:
+Follow the "Singularity installation instructions":https://sylabs.io/guides/latest/user-guide/quick_start.html. Make sure @singularity@ and @mksquashfs@ are working:
 
 <notextile>
 <pre><code>$ <span class="userinput">singularity version</span>
-3.9.9
+singularity-ce version 3.10.4-dirty
 $ <span class="userinput">mksquashfs -version</span>
 mksquashfs version 4.4 (2019/08/29)
 [...]

diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh
index 447d15ca46aa48b3f4fecc0d5521ad930e55ee8c..5890eeea066741089ea12aa323b3d42de785b108 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.9.9
+singularityversion=3.10.4
 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}