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

move cli options to json daemon settings

Browse Source
This commit is contained in:
Bob van der Linden 2021-10-13 22:48:33 +02:00
parent e8dae9246b
commit 92a23655c8
No known key found for this signature in database
GPG Key ID: EEBE8E3EC4A31364
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nixos/modules/virtualisation/docker.nix
View File

@ -186,13 +186,7 @@ in
""
''
${cfg.package}/bin/dockerd \
--group=docker \
--host=fd:// \
--config-file=${daemonSettingsFile} \
--log-driver=${cfg.logDriver} \
${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
${optionalString cfg.liveRestore "--live-restore" } \
${optionalString cfg.enableNvidia "--add-runtime nvidia=${pkgs.nvidia-docker}/bin/nvidia-container-runtime" } \
${cfg.extraOptions}
''];
ExecReload=[
@ -235,6 +229,19 @@ in
{ assertion = cfg.enableNvidia -> config.hardware.opengl.driSupport32Bit or false;
message = "Option enableNvidia requires 32bit support libraries";
}];
virtualisation.docker.daemon.settings = {
group = "docker";
hosts = [ "fd://" ];
"log-driver" = cfg.logDriver;
"storage-driver" = mkIf (cfg.storageDriver != null) cfg.storageDriver;
"live-restore" = cfg.liveRestore;
runtimes = mkIf cfg.enableNvidia {
nvidia = {
path = "${pkgs.nvidia-docker}/bin/nvidia-container-runtime";
};
};
};
}
]);