Merge pull request 'replace bubblewrap with fakeroot' (#343) from joerg-ci into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/343
This commit is contained in:
Mic92
2023-09-26 13:48:30 +00:00
2 changed files with 6 additions and 19 deletions

View File

@@ -107,26 +107,13 @@ def zerotier_controller() -> Iterator[ZerotierController]:
home = tempdir / "zerotier-one" home = tempdir / "zerotier-one"
home.mkdir() home.mkdir()
cmd = nix_shell( cmd = nix_shell(
["bubblewrap"], ["fakeroot"],
[ [
"bwrap", "fakeroot",
"--proc", "--",
"/proc",
"--dev",
"/dev",
"--unshare-user",
"--uid",
"0",
"--gid",
"0",
"--ro-bind",
"/nix",
"/nix",
"--bind",
str(home),
"/var/lib/zerotier-one",
zerotier_exe, zerotier_exe,
f"-p{controller_port}", f"-p{controller_port}",
str(home),
], ],
) )
with subprocess.Popen(cmd) as p: with subprocess.Popen(cmd) as p:

View File

@@ -3,7 +3,6 @@
, argcomplete , argcomplete
, fastapi , fastapi
, uvicorn , uvicorn
, bubblewrap
, installShellFiles , installShellFiles
, nix , nix
, openssh , openssh
@@ -18,6 +17,7 @@
, stdenv , stdenv
, wheel , wheel
, zerotierone , zerotierone
, fakeroot
, rsync , rsync
, ui-assets , ui-assets
, bash , bash
@@ -52,7 +52,7 @@ let
bash bash
nix nix
zerotierone zerotierone
bubblewrap fakeroot
openssh openssh
sshpass sshpass
zbar zbar