public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/containers: Add virtualisation.containers.containersConf.cniPlugins 

(cherry picked from commit efba949352271ec77d9d5e7d54f2d16b9c53ee4f)
This commit is contained in:
Robert Hensing 2021-05-27 13:00:09 +02:00
parent 03e08759f7
commit f28df17dfa
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nixos/modules/virtualisation/containers.nix
View File

@ -48,6 +48,23 @@ in
description = "containers.conf configuration"; description = "containers.conf configuration";
}; };
containersConf.cniPlugins = mkOption {
type = types.listOf types.package;
defaultText = ''
[
pkgs.cni-plugins
]
'';
example = lib.literalExample ''
[
pkgs.cniPlugins.dnsname
]
'';
description = ''
CNI plugins to install on the system.
'';
};
registries = { registries = {
search = mkOption { search = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
@ -97,8 +114,11 @@ in
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
virtualisation.containers.containersConf.cniPlugins = [ pkgs.cni-plugins ];
virtualisation.containers.containersConf.settings = { virtualisation.containers.containersConf.settings = {
network.cni_plugin_dirs = [ "${pkgs.cni-plugins}/bin/" ]; network.cni_plugin_dirs = map (p: "${lib.getBin p}/bin") cfg.containersConf.cniPlugins;
engine = { engine = {
init_path = "${pkgs.catatonit}/bin/catatonit"; init_path = "${pkgs.catatonit}/bin/catatonit";
} // lib.optionalAttrs cfg.ociSeccompBpfHook.enable { } // lib.optionalAttrs cfg.ociSeccompBpfHook.enable {