commit 35ecef2c6d0afebf09ab6504a00b6af14ca24973 · pyrox.dev/nixpkgs

lib/maintainers.nix

···

       88
       88
        
         chris-martin = "Chris Martin <ch.martin@gmail.com>";

     

       89
       89
        
         chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>";

     

       90
       90
        
         christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";

     

       91
       91
       +
         ckampka = "Christian Kampka <christian@kampka.net>";

     

       91
       92
        
         cko = "Christine Koppelt <christine.koppelt@gmail.com>";

     

       92
       93
        
         cleverca22 = "Michael Bishop <cleverca22@gmail.com>";

     

       93
       94
        
         cmcdragonkai = "Roger Qiu <roger.qiu@matrix.ai>";

+17 -1

nixos/modules/virtualisation/containers.nix

···

       129
       129
        
               --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \

     

       130
       130
        
               --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \

     

       131
       131
        
               --setenv PATH="$PATH" \

     

       132
       132
       -
               ${if cfg.additionalCapabilities != null then

     

       132
       132
       +
               ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then

     

       133
       133
        
                 ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else ""

     

       134
       134
       +
               } \

     

       135
       135
       +
               ${if cfg.tmpfs != null && cfg.tmpfs != [] then

     

       136
       136
       +
                 ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else ""

     

       134
       137
        
               } \

     

       135
       138
        
               ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init"

     

       136
       139
        
           '';

     
···

       367
       370
        
             hostAddress6 = null;

     

       368
       371
        
             localAddress = null;

     

       369
       372
        
             localAddress6 = null;

     

       373
       373
       +
             tmpfs = null;

     

       370
       374
        
           };

     

       371
       375
        
       

     

       372
       376
        
       in

     
···

       507
       511
        
                     example = [ { node = "/dev/net/tun"; modifier = "rw"; } ];

     

       508
       512
        
                     description = ''

     

       509
       513
        
                       A list of device nodes to which the containers has access to.

     

       514
       514
       +
                     '';

     

       515
       515
       +
                   };

     

       516
       516
       +
       

     

       517
       517
       +
                   tmpfs = mkOption {

     

       518
       518
       +
                     type = types.listOf types.str;

     

       519
       519
       +
                     default = [];

     

       520
       520
       +
                     example = [ "/var" ];

     

       521
       521
       +
                     description = ''

     

       522
       522
       +
                       Mounts a set of tmpfs file systems into the container.

     

       523
       523
       +
                       Multiple paths can be specified.

     

       524
       524
       +
                       Valid items must conform to the --tmpfs argument

     

       525
       525
       +
                       of systemd-nspawn. See systemd-nspawn(1) for details.

     

       510
       526
        
                     '';

     

       511
       527
        
                   };

     

       512
       528

+79

nixos/tests/containers-tmpfs.nix

···

       1
       1
       +
       # Test for NixOS' container support.

     

       2
       2
       +
       

     

       3
       3
       +
       import ./make-test.nix ({ pkgs, ...} : {

     

       4
       4
       +
         name = "containers-bridge";

     

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

     

       6
       6
       +
           maintainers = [ ckampka ];

     

       7
       7
       +
         };

     

       8
       8
       +
       

     

       9
       9
       +
         machine =

     

       10
       10
       +
           { config, pkgs, ... }:

     

       11
       11
       +
           { imports = [ ../modules/installer/cd-dvd/channel.nix ];

     

       12
       12
       +
             virtualisation.writableStore = true;

     

       13
       13
       +
             virtualisation.memorySize = 768;

     

       14
       14
       +
       

     

       15
       15
       +
             containers.tmpfs =

     

       16
       16
       +
               {

     

       17
       17
       +
                 autoStart = true;

     

       18
       18
       +
                 tmpfs = [

     

       19
       19
       +
                   # Mount var as a tmpfs

     

       20
       20
       +
                   "/var"

     

       21
       21
       +
       

     

       22
       22
       +
                   # Add a nested mount inside a tmpfs

     

       23
       23
       +
                   "/var/log"

     

       24
       24
       +
       

     

       25
       25
       +
                   # Add a tmpfs on a path that does not exist

     

       26
       26
       +
                   "/some/random/path"

     

       27
       27
       +
                 ];

     

       28
       28
       +
                 config = { };

     

       29
       29
       +
               };

     

       30
       30
       +
       

     

       31
       31
       +
             virtualisation.pathsInNixDB = [ pkgs.stdenv ];

     

       32
       32
       +
           };

     

       33
       33
       +
       

     

       34
       34
       +
         testScript =

     

       35
       35
       +
           ''

     

       36
       36
       +
             $machine->waitForUnit("default.target");

     

       37
       37
       +
             $machine->succeed("nixos-container list") =~ /tmpfs/ or die;

     

       38
       38
       +
       

     

       39
       39
       +
             # Start the tmpfs container.

     

       40
       40
       +
             #$machine->succeed("nixos-container status tmpfs") =~ /up/ or die;

     

       41
       41
       +
       

     

       42
       42
       +
             # Verify that /var is mounted as a tmpfs

     

       43
       43
       +
             #$machine->succeed("nixos-container run tmpfs -- systemctl status var.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;

     

       44
       44
       +
             $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var 2>/dev/null");

     

       45
       45
       +
       

     

       46
       46
       +
             # Verify that /var/log is mounted as a tmpfs

     

       47
       47
       +
             $machine->succeed("nixos-container run tmpfs -- systemctl status var-log.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;

     

       48
       48
       +
             $machine->succeed("nixos-container run tmpfs -- mountpoint -q /var/log 2>/dev/null");

     

       49
       49
       +
       

     

       50
       50
       +
             # Verify that /some/random/path is mounted as a tmpfs

     

       51
       51
       +
             $machine->succeed("nixos-container run tmpfs -- systemctl status some-random-path.mount --no-pager 2>/dev/null") =~ /What: tmpfs/ or die;

     

       52
       52
       +
             $machine->succeed("nixos-container run tmpfs -- mountpoint -q /some/random/path 2>/dev/null");

     

       53
       53
       +
       

     

       54
       54
       +
             # Verify that files created in the container in a non-tmpfs directory are visible on the host.

     

       55
       55
       +
             # This establishes legitimacy for the following tests

     

       56
       56
       +
             $machine->succeed("nixos-container run tmpfs -- touch /root/test.file 2>/dev/null");

     

       57
       57
       +
             $machine->succeed("nixos-container run tmpfs -- ls -l  /root | grep -q test.file 2>/dev/null");

     

       58
       58
       +
             $machine->succeed("test -e /var/lib/containers/tmpfs/root/test.file");

     

       59
       59
       +
       

     

       60
       60
       +
       

     

       61
       61
       +
             # Verify that /some/random/path is writable and that files created there

     

       62
       62
       +
             # are not in the hosts container dir but in the tmpfs

     

       63
       63
       +
             $machine->succeed("nixos-container run tmpfs -- touch /some/random/path/test.file 2>/dev/null");

     

       64
       64
       +
             $machine->succeed("nixos-container run tmpfs -- test -e /some/random/path/test.file 2>/dev/null");

     

       65
       65
       +
       

     

       66
       66
       +
             $machine->fail("test -e /var/lib/containers/tmpfs/some/random/path/test.file");

     

       67
       67
       +
       

     

       68
       68
       +
             # Verify that files created in the hosts container dir in a path where a tmpfs file system has been mounted

     

       69
       69
       +
             # are not visible to the container as the do not exist in the tmpfs

     

       70
       70
       +
             $machine->succeed("touch /var/lib/containers/tmpfs/var/test.file");

     

       71
       71
       +
       

     

       72
       72
       +
             $machine->succeed("test -e /var/lib/containers/tmpfs/var/test.file");

     

       73
       73
       +
             $machine->succeed("ls -l /var/lib/containers/tmpfs/var/ | grep -q test.file 2>/dev/null");

     

       74
       74
       +
       

     

       75
       75
       +
             $machine->fail("nixos-container run tmpfs -- ls -l /var | grep -q test.file 2>/dev/null");

     

       76
       76
       +
       

     

       77
       77
       +
           '';

     

       78
       78
       +
       

     

       79
       79
       +
       })