3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/nixos/modules/virtualisation
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
..
amazon-image.nix amazon-image.nix: Resolve failure to include resize2fs 2019-03-15 17:33:45 +01:00
amazon-init.nix
amazon-options.nix
anbox.nix nixos/anbox: init module 2019-03-18 09:28:02 +01:00
azure-agent-entropy.patch
azure-agent.nix
azure-bootstrap-blobs.nix
azure-common.nix
azure-config-user.nix
azure-config.nix
azure-image.nix
azure-images.nix
brightbox-config.nix
brightbox-image.nix
cloudstack-config.nix nixos/cloudstack-image: initial import 2018-11-17 20:40:11 +01:00
container-config.nix modules/profiles/minimal: sound is disabled by default 2019-01-13 13:47:36 +01:00
containers.nix nixos/containers: create veths if only IPv6 is configured 2019-03-20 04:38:10 +01:00
docker-containers.nix nixos: Don't enable Docker by default 2019-03-26 07:10:18 +01:00
docker-image.nix nixos/docker-image: add example usage 2018-11-23 15:40:10 +00:00
docker-preloader.nix nixos/dockerPreloader: guard the entire implemetation with mkIf on image list 2019-02-11 23:35:25 +01:00
docker.nix nixos/docker: add enableNvidia option 2019-02-27 09:56:03 +01:00
ec2-amis.nix ec2-amis.nix: Add 18.09 images 2018-10-15 21:43:16 +02:00
ec2-data.nix
ec2-metadata-fetcher.nix nixos: Add ec2-metadata-fetcher.nix file 2019-02-11 20:58:45 +01:00
ecs-agent.nix
gce-images.nix Update GCE image for 18.09 2018-11-16 11:43:42 +01:00
google-compute-config.nix nixos/modules/virtualisation/google-compute-config.nix: remove google-accounts-daemon 2018-12-21 17:52:37 +01:00
google-compute-image.nix google-compute-image: make it a module and the size tuneable (#49854) 2018-11-26 14:51:00 +00:00
grow-partition.nix
hyperv-guest.nix
kvmgt.nix kvmgt module: add service restart on failure 2018-10-18 22:35:32 +03:00
libvirtd.nix nixos/libvirtd: utilize onShutdown option (#49480) 2018-10-31 00:01:00 +01:00
lxc-container.nix
lxc.nix
lxcfs.nix
lxd.nix
openstack-config.nix openstackImage: set the / fsType to reenable root FS resizing 2019-03-21 10:04:07 +01:00
openvswitch.nix
parallels-guest.nix treewide: remove pkgs_i686 2018-11-03 00:56:39 -05:00
qemu-guest-agent.nix nixos/qemu-guest-agent: pkgs.{kvm -> qemu} (#48293) 2018-10-13 00:41:46 +02:00
qemu-vm.nix nixos/dockerPreloader: preload docker images (#49379) 2018-11-03 01:00:53 +01:00
rkt.nix
virtualbox-guest.nix
virtualbox-host.nix virtualbox-host module: fix warnings syntax 2019-03-09 11:39:22 +01:00
virtualbox-image.nix nixos/virtualbox-image: set the root fsType to reenable root FS resizing 2019-03-24 22:41:26 -04:00
vmware-guest.nix Merge pull request #54917 from peterhoeg/f/vmware 2019-02-20 14:34:25 +08:00
xe-guest-utilities.nix
xen-dom0.nix
xen-domU.nix