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

nixos: Don't enable Docker by default

Browse Source 
Regression introduced by c94005358c185d8262814a5b59b2b4185183bd95.

The commit introduced declarative docker containers and subsequently
enables docker whenever any declarative docker containers are defined.

This is done via an option with type "attrsOf somesubmodule" and a check
on whether the attribute set is empty.

Unfortunately, the check was whether a *list* is empty rather than
wether an attribute set is empty, so "mkIf (cfg != [])" *always*
evaluates to true and thus subsequently enables docker by default:

$ nix-instantiate --eval nixos --arg configuration {} \
    -A config.virtualisation.docker.enable
true

Fixing this is simply done by changing the check to "mkIf (cfg != {})".

Tested this by running the "docker-containers" NixOS test and it still
passes.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @benley, @danbst, @Infinisil, @nlewo
This commit is contained in:
aszlig 2019-03-26 07:10:18 +01:00
parent d5e9e5fcf2
commit 68efd790b8
No known key found for this signature in database
GPG Key ID: 684089CE67EBB691
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/virtualisation/docker-containers.nix
View File

@ -222,7 +222,7 @@ in {
description = "Docker containers to run as systemd services."; description = "Docker containers to run as systemd services.";
}; };
config = mkIf (cfg != []) { config = mkIf (cfg != {}) {
systemd.services = mapAttrs' (n: v: nameValuePair "docker-${n}" (mkService n v)) cfg; systemd.services = mapAttrs' (n: v: nameValuePair "docker-${n}" (mkService n v)) cfg;