19099: Remove unused singularity network permission setup.

[arvados.git] / lib / install / deps.go

diff --git a/lib/install/deps.go b/lib/install/deps.go
index af3cc656c1354f27ada26627bd96eb8b4feed07a..d9a0b69efc7c565be0d6c009aaa8aa62c2240553 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"
@@ -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".
@@ -523,12 +531,10 @@ yarn install
                for _, srcdir := range []string{
                        "cmd/arvados-client",
                        "cmd/arvados-server",
-                       "services/arv-git-httpd",
                        "services/crunch-dispatch-local",
                        "services/crunch-dispatch-slurm",
                        "services/health",
                        "services/keep-balance",
-                       "services/keep-web",
                        "services/keepstore",
                        "services/ws",
                } {