[ARVADOS] created: 2.1.0-2401-g6a9804cbb

[Git user]

        at  6a9804cbbc7e73a3ccea577150374322218c3fd7 (commit)


commit 6a9804cbbc7e73a3ccea577150374322218c3fd7
Author: Tom Clegg <tom at curii.com>
Date:   Thu May 5 09:44:41 2022 -0400

    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 at curii.com>

diff --git a/doc/architecture/singularity.html.textile.liquid b/doc/architecture/singularity.html.textile.liquid
index 9a82cd93d..8ebc6f73d 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 e61b6cbe3..cb0e3c3a4 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/
 
 <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 ae9327696..cdf28e09c 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 2bc41e347..c9fd0945d 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}
 

commit 4af5cb7aa32b6a2a90a696e5e9924f9855119cd2
Author: Tom Clegg <tom at curii.com>
Date:   Wed May 4 16:46:45 2022 -0400

    15730: Add rsync dependency in dev/test env.
    
    Now needed by arvados-server boot to run passenger in test mode.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 62b295a1f..ae9327696 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -138,7 +138,6 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 		pkgs = append(pkgs,
 			"dpkg-dev",
 			"eatmydata", // install it for later steps, even if we're not using it now
-			"rsync",
 		)
 	}
 
@@ -185,6 +184,7 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 			"r-cran-markdown",
 			"r-cran-roxygen2",
 			"r-cran-xml",
+			"rsync",
 			"sudo",
 			"uuid-dev",
 			"wget",

-----------------------------------------------------------------------


hooks/post-receive
--