commit 336ef2de99197dd9c07b302685dc9e6282fa5b55 · pyrox.dev/nixpkgs

+8 -4

nixos/modules/virtualisation/nixos-containers.nix

···

       271
       271
        
           DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices;

     

       272
       272
        
         };

     

       273
       273
        
       

     

       274
       274
       -
       

     

       275
       274
        
         system = config.nixpkgs.localSystem.system;

     

       275
       275
       +
         kernelVersion = config.boot.kernelPackages.kernel.version;

     

       276
       276
        
       

     

       277
       277
        
         bindMountOpts = { name, ... }: {

     

       278
       278
        
       

     
···

       320
       320
        
             };

     

       321
       321
        
           };

     

       322
       322
        
         };

     

       323
       323
       -
       

     

       324
       323
        
       

     

       325
       324
        
         mkBindFlag = d:

     

       326
       325
        
                      let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind=";

     
···

       482
       481
        
                                 networking.useDHCP = false;

     

       483
       482
        
                                 assertions = [

     

       484
       483
        
                                   {

     

       485
       485
       -
                                     assertion =  config.privateNetwork -> stringLength name < 12;

     

       484
       484
       +
                                     assertion =

     

       485
       485
       +
                                       (builtins.compareVersions kernelVersion "5.8" <= 0)

     

       486
       486
       +
                                       -> config.privateNetwork

     

       487
       487
       +
                                       -> stringLength name <= 11;

     

       486
       488
        
                                     message = ''

     

       487
       489
        
                                       Container name `${name}` is too long: When `privateNetwork` is enabled, container names can

     

       488
       490
        
                                       not be longer than 11 characters, because the container's interface name is derived from it.

     

       489
       489
       -
                                       This might be fixed in the future. See https://github.com/NixOS/nixpkgs/issues/38509

     

       491
       491
       +
                                       You should either make the container name shorter or upgrade to a more recent kernel that

     

       492
       492
       +
                                       supports interface altnames (i.e. at least Linux 5.8 - please see https://github.com/NixOS/nixpkgs/issues/38509

     

       493
       493
       +
                                       for details).

     

       490
       494
        
                                     '';

     

       491
       495
        
                                   }

     

       492
       496
        
                                 ];

nixos/tests/all-tests.nix

···

       72
       72
        
         containers-imperative = handleTest ./containers-imperative.nix {};

     

       73
       73
        
         containers-ip = handleTest ./containers-ip.nix {};

     

       74
       74
        
         containers-macvlans = handleTest ./containers-macvlans.nix {};

     

       75
       75
       +
         containers-names = handleTest ./containers-names.nix {};

     

       75
       76
        
         containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {};

     

       76
       77
        
         containers-portforward = handleTest ./containers-portforward.nix {};

     

       77
       78
        
         containers-reloadable = handleTest ./containers-reloadable.nix {};

+37

nixos/tests/containers-names.nix

···

       1
       1
       +
       import ./make-test-python.nix ({ pkgs, lib, ... }: {

     

       2
       2
       +
         name = "containers-names";

     

       3
       3
       +
         meta = {

     

       4
       4
       +
           maintainers = with lib.maintainers; [ patryk27 ];

     

       5
       5
       +
         };

     

       6
       6
       +
       

     

       7
       7
       +
         machine = { ... }: {

     

       8
       8
       +
           # We're using the newest kernel, so that we can test containers with long names.

     

       9
       9
       +
           # Please see https://github.com/NixOS/nixpkgs/issues/38509 for details.

     

       10
       10
       +
           boot.kernelPackages = pkgs.linuxPackages_latest;

     

       11
       11
       +
       

     

       12
       12
       +
           containers = let

     

       13
       13
       +
             container = subnet: {

     

       14
       14
       +
               autoStart = true;

     

       15
       15
       +
               privateNetwork = true;

     

       16
       16
       +
               hostAddress = "192.168.${subnet}.1";

     

       17
       17
       +
               localAddress = "192.168.${subnet}.2";

     

       18
       18
       +
               config = { };

     

       19
       19
       +
             };

     

       20
       20
       +
       

     

       21
       21
       +
            in {

     

       22
       22
       +
             first = container "1";

     

       23
       23
       +
             second = container "2";

     

       24
       24
       +
             really-long-name = container "3";

     

       25
       25
       +
             really-long-long-name-2 = container "4";

     

       26
       26
       +
           };

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         testScript = ''

     

       30
       30
       +
           machine.wait_for_unit("default.target")

     

       31
       31
       +
       

     

       32
       32
       +
           machine.succeed("ip link show | grep ve-first")

     

       33
       33
       +
           machine.succeed("ip link show | grep ve-second")

     

       34
       34
       +
           machine.succeed("ip link show | grep ve-really-lFYWO")

     

       35
       35
       +
           machine.succeed("ip link show | grep ve-really-l3QgY")

     

       36
       36
       +
         '';

     

       37
       37
       +
       })