19099: Fix singularity config script.

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 2d9da72b9785d5419469d1a27c277e300795b738..0d4fe7e9ddfd0e7aaf5afa6af08f88c8744cb751 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -338,11 +338,14 @@ 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
-singularity config global --set 'allow net networks' bridge
-singularity config global --set 'allow net groups' sudo
+/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