diff options
author | Luca Bruno <lethalman88@gmail.com> | 2015-07-05 13:57:10 +0200 |
---|---|---|
committer | Luca Bruno <lethalman88@gmail.com> | 2015-07-05 13:57:23 +0200 |
commit | 6c8e6aaa24a94ed7cd7de5677e68fc353dad2603 (patch) | |
tree | e66f41becbdb552388c87858cd50ae8b990c2266 /nixos | |
parent | af3d395cfe4666973e4cf4105a1b05b509ff1bab (diff) |
nixos docker: fix service and test
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/virtualisation/docker.nix | 3 | ||||
-rw-r--r-- | nixos/tests/docker.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 49170f2220bc..ef9cc2280db7 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -103,6 +103,9 @@ in LimitNPROC = 1048576; } // proxy_env; + path = [ pkgs.kmod ]; + environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; + postStart = '' while ! [ -e /var/run/docker.sock ]; do sleep 0.1 diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 63c909ff294c..fc6449b28d3e 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -15,8 +15,8 @@ import ./make-test.nix { startAll; $docker->waitForUnit("docker.service"); - $docker->succeed("tar cv --files-from /dev/null | docker import - scratch"); - $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratch /bin/sleep 10"); + $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg"); + $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"); $docker->succeed("docker ps | grep sleeping"); $docker->succeed("docker stop sleeping"); ''; |