diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-10-04 13:39:52 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2015-10-04 14:34:38 +0200 |
commit | 5f17aeb4035057deb1840372f5a0a33098ce1e82 (patch) | |
tree | f37477133d86d17368482488859f22dd9a8853d0 /nixos/tests/docker.nix | |
parent | 424e6e501a44dc38c610f6d2039dda1cfafe9490 (diff) |
nixos/docker: default storageDriver to "devicemapper"
Commit 9bfe92ecee ("docker: Minor improvements, fix failing test") added the services.docker.storageDriver option, made it mandatory but didn't give it a default value. This results in an ugly traceback when users enable docker, if they don't pay enough attention to also set the storageDriver option. (An attempt was made to add an assertion, but it didn't work, possibly because of how "mkMerge" works.) The arguments against a default value were that the optimal value depends on the filesystem on the host. This is, AFAICT, only in part true. (It seems some backends are filesystem agnostic.) Also, docker itself uses a default storage driver, "devicemapper", when no --storage-driver=x options are given. Hence, we use the same value as default. Add a FIXME comment that 'devicemapper' breaks NixOS VM tests (for yet unknown reasons), so we still run those with the 'overlay' driver. Closes #10100 and #10217.
Diffstat (limited to 'nixos/tests/docker.nix')
-rw-r--r-- | nixos/tests/docker.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 034dcb04adfd2..635a97e2ce090 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -11,6 +11,8 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { virtualisation.docker.enable = true; + # FIXME: The default "devicemapper" storageDriver fails in NixOS VM + # tests. virtualisation.docker.storageDriver = "overlay"; }; }; |