3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos/modules
aszlig 68efd790b8
nixos: Don't enable Docker by default
Regression introduced by c94005358c.

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
2019-03-26 07:10:18 +01:00
..
config zram: revert "change default algorithm to zstd" (#56856) 2019-03-07 02:11:20 +02:00
hardware nixos/docker: add enableNvidia option 2019-02-27 09:56:03 +01:00
i18n/input-method
installer Merge pull request #54625 from FlorianFranzen/efi32 2019-03-21 11:39:45 -04:00
misc nixos: doc: optionally include all modules in manual generation 2019-03-05 09:41:40 +00:00
profiles profiles/graphical.nix: Enable pulseaudio for virtualbox appliances 2019-02-22 07:23:59 +01:00
programs nixos docs: run the formatting tool (no content change) 2019-03-22 14:44:11 +01:00
security Merge pull request #55792 from sdier/fix/pam-update 2019-02-25 01:38:51 +01:00
services Merge pull request #57139 from delroth/firewall-dedup 2019-03-25 22:15:17 -04:00
system Merge pull request #54625 from FlorianFranzen/efi32 2019-03-21 11:39:45 -04:00
tasks filesystems: Add autoResize assertion 2019-03-16 13:01:35 +01:00
testing types.optionSet: deprecate and remove last usages 2019-01-31 00:41:10 +02:00
virtualisation nixos: Don't enable Docker by default 2019-03-26 07:10:18 +01:00
module-list.nix NixOS: Run Docker containers as declarative systemd services (#55179) 2019-03-25 00:59:09 +02:00
rename.nix tautulli/plexpy: 1.4.25 -> 2.1.26 (renamed) 2019-02-28 19:07:00 +01:00