Branch: refs/heads/release-15.09
Home: https://github.com/NixOS/nixpkgs
Commit: ab0a464e4b04773d48f14cf4cbb934eca3ef465c
https://github.com/NixOS/nixpkgs/commit/ab0a464e4b04773d48f14cf4cbb934eca3ef465c
Author: Bjørn Forsman <[email protected]>
Date: 2015-10-04 (Sun, 04 Oct 2015)
Changed paths:
M nixos/modules/virtualisation/docker.nix
M nixos/tests/docker.nix
Log Message:
-----------
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.
(cherry picked from commit 5f17aeb4035057deb1840372f5a0a33098ce1e82)
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
