public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos docker: fix service and test

This commit is contained in:
Luca Bruno 2015-07-05 13:57:10 +02:00
parent af3d395cfe
commit 6c8e6aaa24
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/virtualisation/docker.nix
View File

@ -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

4
nixos/tests/docker.nix
View File

@ -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");
'';