containerization #3

Merged
flowey merged 3 commits from frcc-kvm into master 2026-09-12 06:40:12 +00:00
Showing only changes of commit 1862e7660e - Show all commits
+1 -1
View File
@@ -287,7 +287,7 @@ rec {
allBindMounts = builtins.foldl' (acc: t: acc // (t.resources.fs or { })) { } traits // bindMounts; allBindMounts = builtins.foldl' (acc: t: acc // (t.resources.fs or { })) { } traits // bindMounts;
userModules = map mkUser (lib.concatMap (t: t.users or [ ]) traits ++ users); userModules = map mkUser (lib.concatMap (t: t.users or [ ]) traits ++ users);
allPorts = ports ++ map (p: (normalizePort p).container) hostPorts; allPorts = ports ++ map (p: (normalizePort p).container) hostPorts;
useIdmap = privateUsers != "no"; useIdmap = privateUsers == "pick" || (builtins.isInt privateUsers && privateUsers > 0);
bindMountExtraFlags = lib.mapAttrsToList ( bindMountExtraFlags = lib.mapAttrsToList (
mountPoint: bm: mountPoint: bm:
(if bm.isReadOnly then "--bind-ro=" else "--bind=") (if bm.isReadOnly then "--bind-ro=" else "--bind=")