git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108547 from cpcloud/podman-nvidia
commitce9a7356a33dcf97611abeeef5b97d467917d8de authorJörg Thalheim <Mic92@users.noreply.github.com> dateSat 9 Jan 2021, 10:37 (6 years ago) parentf1a316b7115e5a
3 files changed+73−18
nixos/modules/virtualisation/podman.nix+42−16 pkgs/applications/virtualization/nvidia-docker/default.nix+18−2 pkgs/applications/virtualization/nvidia-docker/podman-config.toml+13
nixos/modules/virtualisation/podman.nix+42−16
@@ -1,6 +1,8 @@
11{ config, lib, pkgs, utils, ... }:
22let
33 cfg = config.virtualisation.podman;
4+ toml = pkgs.formats.toml { };
5+ nvidia-docker = pkgs.nvidia-docker.override { containerRuntimePath = "${pkgs.runc}/bin/runc"; };
46
57 inherit (lib) mkOption types;
68
@@ -53,6 +55,14 @@ in
5355 '';
5456 };
5557
58+ enableNvidia = mkOption {
59+ type = types.bool;
60+ default = false;
61+ description = ''
62+ Enable use of NVidia GPUs from within podman containers.
63+ '';
64+ };
65+
5666 extraPackages = mkOption {
5767 type = with types; listOf package;
5868 default = [ ];
@@ -78,21 +88,37 @@ in
7888
7989 };
8090
81− config = lib.mkIf cfg.enable {
82−
83− environment.systemPackages = [ cfg.package ]
84− ++ lib.optional cfg.dockerCompat dockerCompat;
85−
86− environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist";
87−
88− # Enable common /etc/containers configuration
89− virtualisation.containers.enable = true;
90−
91− assertions = [{
92− assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable;
93− message = "Option dockerCompat conflicts with docker";
94− }];
95−
96− };
91+ config = lib.mkIf cfg.enable (lib.mkMerge [
92+ {
93+ environment.systemPackages = [ cfg.package ]
94+ ++ lib.optional cfg.dockerCompat dockerCompat;
95+
96+ environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist";
97+
98+ virtualisation.containers = {
99+ enable = true; # Enable common /etc/containers configuration
100+ containersConf.extraConfig = lib.optionalString cfg.enableNvidia
101+ (builtins.readFile (toml.generate "podman.nvidia.containers.conf" {
102+ engine = {
103+ conmon_env_vars = [ "PATH=${lib.makeBinPath [ nvidia-docker ]}" ];
104+ runtimes.nvidia = [ "${nvidia-docker}/bin/nvidia-container-runtime" ];
105+ };
106+ }));
107+ };
97108
109+ assertions = [
110+ {
111+ assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable;
112+ message = "Option dockerCompat conflicts with docker";
113+ }
114+ {
115+ assertion = cfg.enableNvidia -> !config.virtualisation.docker.enableNvidia;
116+ message = "Option enableNvidia conflicts with docker.enableNvidia";
117+ }
118+ ];
119+ }
120+ (lib.mkIf cfg.enableNvidia {
121+ environment.etc."nvidia-container-runtime/config.toml".source = "${nvidia-docker}/etc/podman-config.toml";
122+ })
123+ ]);
98124}
pkgs/applications/virtualization/nvidia-docker/default.nix+18−2
@@ -6,15 +6,23 @@
66, makeWrapper
77, buildGoModule
88, buildGoPackage
9−, git
109, glibc
10+, docker
11+, linkFarm
12+, containerRuntimePath ? "${docker}/libexec/docker/runc"
1113}:
1214
1315with lib; let
1416 libnvidia-container = callPackage ./libnvc.nix { };
17+ isolatedContainerRuntimePath = linkFarm "isolated_container_runtime_path" [
18+ {
19+ name = "runc";
20+ path = containerRuntimePath;
21+ }
22+ ];
1523
1624 nvidia-container-runtime = buildGoPackage rec {
17− pname = "nvidia-container-toolkit";
25+ pname = "nvidia-container-runtime";
1826 version = "3.4.0";
1927 src = fetchFromGitHub {
2028 owner = "NVIDIA";
@@ -74,10 +82,18 @@ stdenv.mkDerivation rec {
7482 installPhase = ''
7583 mkdir -p $out/{bin,etc}
7684 cp -r bin $out
85+
7786 wrapProgram $out/bin/nvidia-container-cli \
7887 --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:/run/opengl-driver-32/lib
88+
89+ # nvidia-container-runtime invokes docker-runc or runc if that isn't available on PATH
90+ wrapProgram $out/bin/nvidia-container-runtime --prefix PATH : ${isolatedContainerRuntimePath}
91+
7992 cp ${./config.toml} $out/etc/config.toml
8093 substituteInPlace $out/etc/config.toml --subst-var-by glibcbin ${lib.getBin glibc}
94+
95+ cp ${./podman-config.toml} $out/etc/podman-config.toml
96+ substituteInPlace $out/etc/podman-config.toml --subst-var-by glibcbin ${lib.getBin glibc}
8197 '';
8298
8399 meta = {
pkgs/applications/virtualization/nvidia-docker/podman-config.tomlnew file+13
@@ -0,0 +1,13 @@
1+disable-require = true
2+#swarm-resource = "DOCKER_RESOURCE_GPU"
3+
4+[nvidia-container-cli]
5+#root = "/run/nvidia/driver"
6+#path = "/usr/bin/nvidia-container-cli"
7+environment = []
8+#debug = "/var/log/nvidia-container-runtime-hook.log"
9+ldcache = "/tmp/ld.so.cache"
10+load-kmods = true
11+no-cgroups = true
12+#user = "root:video"
13+ldconfig = "@@glibcbin@/bin/ldconfig"