X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f2c2cb93161f2a50c23e6e6ebbdf2bb879e05da2..c78c7272f9ab77297fbb4e521ab09fe9560754fe:/lib/install/deps.go

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 62b295a1f1..d9a0b69efc 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"
@@ -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",
@@ -338,6 +338,14 @@ make -C ./builddir install
 			}
 		}
 
+		err = inst.runBash(`
+install /usr/bin/nsenter /var/lib/arvados/bin/nsenter
+setcap "cap_sys_admin+pei cap_sys_chroot+pei" /var/lib/arvados/bin/nsenter
+`, 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".