X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/be93d1d225ca8d4bccf08d9203d456b5d32dc07b..9d7aa0bee7dce81bc86ba46c72298597609449d6:/lib/install/deps.go

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 8277fd2f28..77a64df895 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -178,9 +178,15 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 			"r-cran-roxygen2",
 			"r-cran-xml",
 			"sudo",
+			"uuid-dev",
 			"wget",
 			"xvfb",
 		)
+		if dev || test {
+			pkgs = append(pkgs,
+				"squashfs-tools", // for singularity
+			)
+		}
 		switch {
 		case osv.Debian && osv.Major >= 10:
 			pkgs = append(pkgs, "libcurl4")
@@ -284,7 +290,7 @@ ln -sf /var/lib/arvados/bin/geckodriver /usr/local/bin/
 			}
 		}
 
-		nodejsversion := "v10.23.1"
+		nodejsversion := "v12.22.2"
 		if havenodejsversion, err := exec.Command("/usr/local/bin/node", "--version").CombinedOutput(); err == nil && string(havenodejsversion) == nodejsversion+"\n" {
 			logger.Print("nodejs " + nodejsversion + " already installed")
 		} else {
@@ -316,6 +322,27 @@ rm ${zip}
 			}
 		}
 
+		singularityversion := "3.5.2"
+		if havesingularityversion, err := exec.Command("/var/lib/arvados/bin/singularity", "--version").CombinedOutput(); err == nil && strings.Contains(string(havesingularityversion), singularityversion) {
+			logger.Print("singularity " + singularityversion + " already installed")
+		} else if dev || test {
+			err = inst.runBash(`
+S=`+singularityversion+`
+tmp=/var/lib/arvados/tmp/singularity
+trap "rm -r ${tmp}" ERR EXIT
+cd /var/lib/arvados/tmp
+git clone https://github.com/sylabs/singularity
+cd singularity
+git checkout v${S}
+./mconfig --prefix=/var/lib/arvados
+make -C ./builddir
+make -C ./builddir install
+`, stdout, stderr)
+			if err != nil {
+				return 1
+			}
+		}
+
 		// The entry in /etc/locale.gen is "en_US.UTF-8"; once
 		// it's installed, locale -a reports it as
 		// "en_US.utf8".