movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

rename daemonConfig -> daemon.settings

Browse source
This commit is contained in:
Bob van der Linden 2021-12-19 14:16:58 +01:00
parent 142a1540d6
commit c1b0d4acf5
No known key found for this signature in database
GPG key ID: EEBE8E3EC4A31364
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/virtualisation/docker.nix
View file

@ -8,8 +8,8 @@ let
cfg = config.virtualisation.docker;
proxy_env = config.networking.proxy.envVars;
daemonConfigJson = builtins.toJSON cfg.daemonConfig;
daemonConfigFile = pkgs.writeText "daemon.json" daemonConfigJson;
daemonSettingsJson = builtins.toJSON cfg.daemon.settings;
daemonSettingsFile = pkgs.writeText "daemon.json" daemonSettingsJson;
in
{
@ -53,7 +53,7 @@ in
'';
};
daemonConfig =
daemon.settings =
mkOption {
type = types.anything;
default = { };
@ -188,7 +188,7 @@ in
${cfg.package}/bin/dockerd \
--group=docker \
--host=fd:// \
--config-file=${daemonConfigFile} \
--config-file=${daemonSettingsFile} \
--log-driver=${cfg.logDriver} \
${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \
${optionalString cfg.liveRestore "--live-restore" } \