From: Tom Clegg Date: Fri, 13 May 2022 19:34:26 +0000 (-0400) Subject: 19099: Fix singularity config script. X-Git-Tag: 2.5.0~163^2~5 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/503860c347e620432ee501c1edc245fca94bf729 19099: Fix singularity config script. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- diff --git a/lib/install/deps.go b/lib/install/deps.go index 2d9da72b97..0d4fe7e9dd 100644 --- 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