about summary refs log tree commit diff
path: root/nixos/tests/docker.nix
diff options
context:
space:
mode:
authorTim Steinbach <tim@nequissimus.com>2017-09-04 19:02:44 -0400
committerTim Steinbach <tim@nequissimus.com>2017-09-04 19:02:44 -0400
commit380ed98bd793b2f3cbf257b7ef9601770c4f8d48 (patch)
tree214dbc40e01af13e63344f1399f63f7e86491e6d /nixos/tests/docker.nix
parent2bb57ef7761fc9d408bb27b2733d36c8640e0e4b (diff)
docker: Add test for docker-edge, check for proper versions in tests
Diffstat (limited to 'nixos/tests/docker.nix')
-rw-r--r--nixos/tests/docker.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index 9096a5868f6cc..c6c8f4cdb5fb9 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -3,7 +3,7 @@
 import ./make-test.nix ({ pkgs, ...} : {
   name = "docker";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ offline ];
+    maintainers = [ nequissimus offline ];
   };
 
   nodes = {
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       { config, pkgs, ... }:
         {
           virtualisation.docker.enable = true;
+          virtualisation.docker.package = pkgs.docker;
 
           users.users = {
             noprivs = {
@@ -39,5 +40,8 @@ import ./make-test.nix ({ pkgs, ...} : {
     $docker->succeed("sudo -u hasprivs docker ps");
     $docker->fail("sudo -u noprivs docker ps");
     $docker->succeed("docker stop sleeping");
+
+    # Must match version twice to ensure client and server versions are correct
+    $docker->succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]');
   '';
 })