diff options
| author | Bob van der Linden <bobvanderlinden@gmail.com> | 2021-10-13 22:48:33 +0200 |
|---|---|---|
| committer | Bob van der Linden <bobvanderlinden@gmail.com> | 2021-12-19 14:17:04 +0100 |
| commit | 92a23655c801a27df438ad504792ad3128d117e5 (patch) | |
| tree | 9edc56278efb2f8dfe2da963aaf8417da968b192 /nixos | |
| parent | e8dae9246b5ce13bc573c2e2747c1c62f5ac38e0 (diff) | |
| download | nixpkgs-92a23655c801a27df438ad504792ad3128d117e5.tar nixpkgs-92a23655c801a27df438ad504792ad3128d117e5.tar.gz nixpkgs-92a23655c801a27df438ad504792ad3128d117e5.tar.bz2 nixpkgs-92a23655c801a27df438ad504792ad3128d117e5.tar.lz nixpkgs-92a23655c801a27df438ad504792ad3128d117e5.tar.xz nixpkgs-92a23655c801a27df438ad504792ad3128d117e5.tar.zst nixpkgs-92a23655c801a27df438ad504792ad3128d117e5.zip | |
move cli options to json daemon settings
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/docker.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index b131ebd4f17..cdb693c3c54 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -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"; + }; + }; + }; } ]); |