From: Tom Clegg <tom@curii.com>
Date: Mon, 16 May 2022 19:15:12 +0000 (-0400)
Subject: 19099: Remove unused singularity network permission setup.
X-Git-Tag: 2.5.0~163^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c78c7272f9ab77297fbb4e521ab09fe9560754fe

19099: Remove unused singularity network permission setup.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 0d4fe7e9dd..d9a0b69efc 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -338,14 +338,9 @@ make -C ./builddir install
 			}
 		}
 
-		// Allow users in the "sudo" group to use
-		// --network=bridge without --fakeroot. (Currently
-		// tests use --fakeroot anyway.)
 		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
-/var/lib/arvados/bin/singularity config global --set 'allow net networks' bridge
-/var/lib/arvados/bin/singularity config global --set 'allow net groups' sudo
 `, stdout, stderr)
 		if err != nil {
 			return 1