commit 1a70c803cbebc4d4c5d506e6fb03dffd86e284f2 · pyrox.dev/nixpkgs

+11 -6

nixos/tests/docker-tools-nix-shell.nix

···

       6
       6
        
       {

     

       7
       7
        
         name = "docker-tools-nix-shell";

     

       8
       8
        
         meta = with lib.maintainers; {

     

       9
       9
       -
           maintainers = [ infinisil roberth ];

     

       9
       9
       +
           maintainers = [

     

       10
       10
       +
             infinisil

     

       11
       11
       +
             roberth

     

       12
       12
       +
           ];

     

       10
       13
        
         };

     

       11
       14
        
       

     

       12
       15
        
         nodes = {

     

       13
       13
       -
           docker = { ... }: {

     

       14
       14
       -
             virtualisation = {

     

       15
       15
       -
               diskSize = 3072;

     

       16
       16
       -
               docker.enable = true;

     

       16
       16
       +
           docker =

     

       17
       17
       +
             { ... }:

     

       18
       18
       +
             {

     

       19
       19
       +
               virtualisation = {

     

       20
       20
       +
                 diskSize = 3072;

     

       21
       21
       +
                 docker.enable = true;

     

       22
       22
       +
               };

     

       17
       23
        
             };

     

       18
       18
       -
           };

     

       19
       24
        
         };

     

       20
       25
        
       

     

       21
       26
        
         testScript = ''

+1 -1

nixos/tests/docker-tools.nix

···

       60
       60
        
           };

     

       61
       61
        
       

     

       62
       62
        
         nonRootTestImage =

     

       63
       63
       -
           pkgs.dockerTools.streamLayeredImage rec {

     

       63
       63
       +
           pkgs.dockerTools.streamLayeredImage {

     

       64
       64
        
             name = "non-root-test";

     

       65
       65
        
             tag = "latest";

     

       66
       66
        
             uid = 1000;