Allow overriding bubblewrap
This commit is contained in:
parent
06c7210127
commit
595bc0e2e4
3 changed files with 24 additions and 1 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
{ pkgs
|
{ pkgs
|
||||||
, additionalCombinators ? _: {}
|
, additionalCombinators ? _: {}
|
||||||
, basePermissions ? import ./base-permissions.nix pkgs
|
, basePermissions ? import ./base-permissions.nix pkgs
|
||||||
|
, bubblewrapPackage ? pkgs.bubblewrap
|
||||||
}: let
|
}: let
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
|
|
||||||
|
|
@ -21,7 +22,7 @@ in {
|
||||||
__functor = _: name: exe: permissions: let
|
__functor = _: name: exe: permissions: let
|
||||||
initialState = {
|
initialState = {
|
||||||
name = name;
|
name = name;
|
||||||
cmd = "${lib.getExe pkgs.bubblewrap}";
|
cmd = lib.getExe bubblewrapPackage;
|
||||||
entry = if builtins.typeOf exe == "string" then lib.escapeShellArg exe else lib.getExe exe;
|
entry = if builtins.typeOf exe == "string" then lib.escapeShellArg exe else lib.getExe exe;
|
||||||
path = [];
|
path = [];
|
||||||
argv = "\"$@\"";
|
argv = "\"$@\"";
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,23 @@ in {
|
||||||
(assertStdout (jail' "hello" (sh "cat /build/secret") []) "hunter2")
|
(assertStdout (jail' "hello" (sh "cat /build/secret") []) "hunter2")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
"it allows overriding the bubblewrap package" = let
|
||||||
|
jail' = jail-nix.lib.extend {
|
||||||
|
inherit pkgs;
|
||||||
|
bubblewrapPackage = pkgs.writeShellApplication {
|
||||||
|
name = "my-bubblewrap";
|
||||||
|
text = ''
|
||||||
|
# A version of bwrap that just prints its arguments instead of
|
||||||
|
# actually running a jail.
|
||||||
|
echo "$@"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
basePermissions = null;
|
||||||
|
};
|
||||||
|
in assertStdout
|
||||||
|
(jail' "test" "some-entrypoint" [])
|
||||||
|
"--unshare-user --unshare-ipc --unshare-pid --unshare-net --unshare-uts --unshare-cgroup --new-session -- some-entrypoint";
|
||||||
|
|
||||||
"it sets a sane default path" = assertStdout
|
"it sets a sane default path" = assertStdout
|
||||||
(jail "test" (sh ''echo "$PATH"'') [])
|
(jail "test" (sh ''echo "$PATH"'') [])
|
||||||
defaultPath;
|
defaultPath;
|
||||||
|
|
|
||||||
|
|
@ -62,3 +62,8 @@ jail = jail-nix.lib.extend {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## bubblewrapPackage
|
||||||
|
|
||||||
|
This configuration option allows you to override what bubblewrap package
|
||||||
|
jail.nix uses for its jails. The default value is `pkgs.bubblewrap`.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue