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

nixos/docker: move live-restore option into daemon.settings

Browse Source 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
This commit is contained in:
Sefa Eyeoglu 2024-10-16 10:47:04 +02:00
parent 9d26556575
commit 5900b644bb
No known key found for this signature in database
GPG Key ID: E13DFD4B47127951
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,19 @@ in
daemon.settings = daemon.settings =
mkOption { mkOption {
type = settingsFormat.type; type = types.submodule {
freeformType = settingsFormat.type;
options = {
live-restore = mkOption {
type = types.bool;
default = true;
description = ''
Allow dockerd to be restarted without affecting running container.
This option is incompatible with docker swarm.
'';
};
};
};
default = { }; default = { };
example = { example = {
ipv6 = true; ipv6 = true;
@ -75,16 +87,6 @@ in
''; '';
}; };
liveRestore =
mkOption {
type = types.bool;
default = true;
description = ''
Allow dockerd to be restarted without affecting running container.
This option is incompatible with docker swarm.
'';
};
storageDriver = storageDriver =
mkOption { mkOption {
type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]); type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]);
@ -253,7 +255,6 @@ in
hosts = [ "fd://" ]; hosts = [ "fd://" ];
log-driver = mkDefault cfg.logDriver; log-driver = mkDefault cfg.logDriver;
storage-driver = mkIf (cfg.storageDriver != null) (mkDefault cfg.storageDriver); storage-driver = mkIf (cfg.storageDriver != null) (mkDefault cfg.storageDriver);
live-restore = mkDefault cfg.liveRestore;
runtimes = mkIf cfg.enableNvidia { runtimes = mkIf cfg.enableNvidia {
nvidia = { nvidia = {
# Use the legacy nvidia-container-runtime wrapper to allow # Use the legacy nvidia-container-runtime wrapper to allow
@ -269,6 +270,7 @@ in
imports = [ imports = [
(mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed and socket activation is now always active") (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed and socket activation is now always active")
(mkAliasOptionModule ["virtualisation" "docker" "liveRestore"] ["virtualisation" "docker" "daemon" "settings" "live-restore"])
]; ];
} }