diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2016-09-10 12:55:46 +0200 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2016-09-13 12:51:13 +0200 |
| commit | 5d9c62541a3524fd2c035b75058a0cb412b61f95 (patch) | |
| tree | 584b9af1ef5ddd1be7a6358578dbf38af7b4177e /nixos/tests/docker.nix | |
| parent | 0a518618a2760ec1c7635f62603172194df81577 (diff) | |
| download | nixpkgs-5d9c62541a3524fd2c035b75058a0cb412b61f95.tar nixpkgs-5d9c62541a3524fd2c035b75058a0cb412b61f95.tar.gz nixpkgs-5d9c62541a3524fd2c035b75058a0cb412b61f95.tar.bz2 nixpkgs-5d9c62541a3524fd2c035b75058a0cb412b61f95.tar.lz nixpkgs-5d9c62541a3524fd2c035b75058a0cb412b61f95.tar.xz nixpkgs-5d9c62541a3524fd2c035b75058a0cb412b61f95.tar.zst nixpkgs-5d9c62541a3524fd2c035b75058a0cb412b61f95.zip | |
docker module: updates
- logDriver option, use journald for logging by default - keep storage driver intact by default, as docker has sane defaults - do not choose storage driver in tests, docker will choose by itself - use dockerd binary as "docker daemon" command is deprecated and will be removed - add overlay2 to list of storage drivers
Diffstat (limited to 'nixos/tests/docker.nix')
| -rw-r--r-- | nixos/tests/docker.nix | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 06e511d6e0b..1b57a94a05d 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -11,9 +11,6 @@ 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"; }; }; |