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

nixos/docker: keep live-restore disabled by default

Browse Source 
See https://docs.docker.com/engine/daemon/live-restore/
See https://discourse.nixos.org/t/docker-hanging-on-reboot/18270/5
Closes https://github.com/NixOS/nixpkgs/issues/182916

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

2
nixos/doc/manual/release-notes/rl-2411.section.md
View File

@ -629,6 +629,8 @@
- `lib.misc.mapAttrsFlatten` is now formally deprecated and will be removed in future releases; use the identical [`lib.attrsets.mapAttrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.mapAttrsToList) instead. - `lib.misc.mapAttrsFlatten` is now formally deprecated and will be removed in future releases; use the identical [`lib.attrsets.mapAttrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.mapAttrsToList) instead.
- `virtualisation.docker.liveRestore` has been renamed to `virtualisation.docker.daemon.settings."live-restore"` and turned off by default for state versions of at least 24.11.
- Tailscale's `authKeyFile` can now have its corresponding parameters set through `config.services.tailscale.authKeyParameters`, allowing for non-ephemeral unsupervised deployment and more. - Tailscale's `authKeyFile` can now have its corresponding parameters set through `config.services.tailscale.authKeyParameters`, allowing for non-ephemeral unsupervised deployment and more.
See [Registering new nodes using OAuth credentials](https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials) for the supported options. See [Registering new nodes using OAuth credentials](https://tailscale.com/kb/1215/oauth-clients#registering-new-nodes-using-oauth-credentials) for the supported options.

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

@ -57,7 +57,10 @@ in
options = { options = {
live-restore = mkOption { live-restore = mkOption {
type = types.bool; type = types.bool;
default = true; # Prior to NixOS 24.11, this was set to true by default, while upstream defaulted to false.
# Keep the option unset to follow upstream defaults
default = versionOlder config.system.stateVersion "24.11";
defaultText = literalExpression "versionOlder config.system.stateVersion \"24.11\"";
description = '' description = ''
Allow dockerd to be restarted without affecting running container. Allow dockerd to be restarted without affecting running container.
This option is incompatible with docker swarm. This option is incompatible with docker swarm.
@ -68,6 +71,7 @@ in
default = { }; default = { };
example = { example = {
ipv6 = true; ipv6 = true;
"live-restore" = true;
"fixed-cidr-v6" = "fd00::/80"; "fixed-cidr-v6" = "fd00::/80";
}; };
description = '' description = ''