commit d3b5f7650551e90a4e3b486327521a18e7d5419d · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       375
       375
        
         docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { };

     

       376
       376
        
         docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;

     

       377
       377
        
         docker-tools-cross = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix { };

     

       378
       378
       -
         docker-tools-overlay = handleTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix { };

     

       378
       378
       +
         docker-tools-overlay = runTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix;

     

       379
       379
        
         docling-serve = runTest ./docling-serve.nix;

     

       380
       380
        
         documize = handleTest ./documize.nix { };

     

       381
       381
        
         documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };

+30 -33

nixos/tests/docker-tools-overlay.nix

···

       1
       1
        
       # this test creates a simple GNU image with docker tools and sees if it executes

     

       2
       2
       +
       { pkgs, ... }:

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "docker-tools-overlay";

     

       5
       5
       +
         meta = with pkgs.lib.maintainers; {

     

       6
       6
       +
           maintainers = [

     

       7
       7
       +
             lnl7

     

       8
       8
       +
             roberth

     

       9
       9
       +
           ];

     

       10
       10
       +
         };

     

       2
       11
        
       

     

       3
       3
       -
       import ./make-test-python.nix (

     

       4
       4
       -
         { pkgs, ... }:

     

       5
       5
       -
         {

     

       6
       6
       -
           name = "docker-tools-overlay";

     

       7
       7
       -
           meta = with pkgs.lib.maintainers; {

     

       8
       8
       -
             maintainers = [

     

       9
       9
       -
               lnl7

     

       10
       10
       -
               roberth

     

       11
       11
       -
             ];

     

       12
       12
       -
           };

     

       12
       12
       +
         nodes = {

     

       13
       13
       +
           docker =

     

       14
       14
       +
             { ... }:

     

       15
       15
       +
             {

     

       16
       16
       +
               virtualisation.docker.enable = true;

     

       17
       17
       +
               virtualisation.docker.storageDriver = "overlay2";

     

       18
       18
       +
             };

     

       19
       19
       +
         };

     

       13
       20
        
       

     

       14
       14
       -
           nodes = {

     

       15
       15
       -
             docker =

     

       16
       16
       -
               { ... }:

     

       17
       17
       -
               {

     

       18
       18
       -
                 virtualisation.docker.enable = true;

     

       19
       19
       -
                 virtualisation.docker.storageDriver = "overlay2";

     

       20
       20
       -
               };

     

       21
       21
       -
           };

     

       21
       21
       +
         testScript = ''

     

       22
       22
       +
           docker.wait_for_unit("sockets.target")

     

       22
       23
        
       

     

       23
       23
       -
           testScript = ''

     

       24
       24
       -
             docker.wait_for_unit("sockets.target")

     

       24
       24
       +
           docker.succeed(

     

       25
       25
       +
               "docker load --input='${pkgs.dockerTools.examples.bash}'",

     

       26
       26
       +
               "docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version",

     

       27
       27
       +
           )

     

       25
       28
        
       

     

       26
       26
       -
             docker.succeed(

     

       27
       27
       -
                 "docker load --input='${pkgs.dockerTools.examples.bash}'",

     

       28
       28
       -
                 "docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version",

     

       29
       29
       -
             )

     

       30
       30
       -
       

     

       31
       31
       -
             # Check if the nix store has correct user permissions depending on what

     

       32
       32
       -
             # storage driver is used, incorrectly built images can show up as readonly.

     

       33
       33
       -
             # drw-------  3 0 0   3 Apr 14 11:36 /nix

     

       34
       34
       -
             # drw------- 99 0 0 100 Apr 14 11:36 /nix/store

     

       35
       35
       -
             docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")

     

       36
       36
       -
           '';

     

       37
       37
       -
         }

     

       38
       38
       -
       )

     

       29
       29
       +
           # Check if the nix store has correct user permissions depending on what

     

       30
       30
       +
           # storage driver is used, incorrectly built images can show up as readonly.

     

       31
       31
       +
           # drw-------  3 0 0   3 Apr 14 11:36 /nix

     

       32
       32
       +
           # drw------- 99 0 0 100 Apr 14 11:36 /nix/store

     

       33
       33
       +
           docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")

     

       34
       34
       +
         '';

     

       35
       35
       +
       }