commit 54f2f1e5f1c7fd34e564a84443e8490477e26eb7 · pyrox.dev/nixpkgs

+36

nixos/modules/virtualisation/podman-dnsname.nix

···

       1
       +
       { config, lib, pkgs, ... }:

     

       2
       +
       let

     

       3
       +
         inherit (lib)

     

       4
       +
           mkOption

     

       5
       +
           mkIf

     

       6
       +
           types

     

       7
       +
           ;

     

       8
       +
       

     

       9
       +
         cfg = config.virtualisation.podman;

     

       10
       +
       

     

       11
       +
       in

     

       12
       +
       {

     

       13
       +
         options = {

     

       14
       +
           virtualisation.podman = {

     

       15
       +
       

     

       16
       +
             defaultNetwork.dnsname.enable = mkOption {

     

       17
       +
               type = types.bool;

     

       18
       +
               default = false;

     

       19
       +
               description = ''

     

       20
       +
                 Enable DNS resolution in the default podman network.

     

       21
       +
               '';

     

       22
       +
             };

     

       23
       +
       

     

       24
       +
           };

     

       25
       +
         };

     

       26
       +
       

     

       27
       +
         config = {

     

       28
       +
           virtualisation.containers.containersConf.cniPlugins = mkIf cfg.defaultNetwork.dnsname.enable [ pkgs.dnsname-cni ];

     

       29
       +
           virtualisation.podman.defaultNetwork.extraPlugins =

     

       30
       +
             lib.optional cfg.defaultNetwork.dnsname.enable {

     

       31
       +
               type = "dnsname";

     

       32
       +
               domainName = "dns.podman";

     

       33
       +
               capabilities.aliases = true;

     

       34
       +
             };

     

       35
       +
         };

     

       36
       +
       }

+1

nixos/modules/virtualisation/podman.nix

···

       39
        
       in

     

       40
        
       {

     

       41
        
         imports = [

     

       0
        
       
     

       42
        
           ./podman-network-socket.nix

     

       43
        
           (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ])

     

       44
        
         ];

···

       39
        
       in

     

       40
        
       {

     

       41
        
         imports = [

     

       42
       +
           ./podman-dnsname.nix

     

       43
        
           ./podman-network-socket.nix

     

       44
        
           (lib.mkRenamedOptionModule [ "virtualisation" "podman" "libpod" ] [ "virtualisation" "containers" "containersConf" ])

     

       45
        
         ];

+1

nixos/tests/all-tests.nix

···

       335
        
         plotinus = handleTest ./plotinus.nix {};

     

       336
        
         podgrab = handleTest ./podgrab.nix {};

     

       337
        
         podman = handleTestOn ["x86_64-linux"] ./podman.nix {};

     

       0
        
       
     

       338
        
         podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {};

     

       339
        
         pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};

     

       340
        
         postfix = handleTest ./postfix.nix {};

···

       335
        
         plotinus = handleTest ./plotinus.nix {};

     

       336
        
         podgrab = handleTest ./podgrab.nix {};

     

       337
        
         podman = handleTestOn ["x86_64-linux"] ./podman.nix {};

     

       338
       +
         podman-dnsname = handleTestOn ["x86_64-linux"] ./podman-dnsname.nix {};

     

       339
        
         podman-tls-ghostunnel = handleTestOn ["x86_64-linux"] ./podman-tls-ghostunnel.nix {};

     

       340
        
         pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {};

     

       341
        
         postfix = handleTest ./postfix.nix {};

+42

nixos/tests/podman-dnsname.nix

···

       1
       +
       import ./make-test-python.nix (

     

       2
       +
         { pkgs, lib, ... }:

     

       3
       +
         let

     

       4
       +
           inherit (pkgs) writeTextDir python3 curl;

     

       5
       +
           webroot = writeTextDir "index.html" "<h1>Hi</h1>";

     

       6
       +
         in

     

       7
       +
         {

     

       8
       +
           name = "podman-dnsname";

     

       9
       +
           meta = {

     

       10
       +
             maintainers = with lib.maintainers; [ roberth ] ++ lib.teams.podman.members;

     

       11
       +
           };

     

       12
       +
       

     

       13
       +
           nodes = {

     

       14
       +
             podman = { pkgs, ... }: {

     

       15
       +
               virtualisation.podman.enable = true;

     

       16
       +
               virtualisation.podman.defaultNetwork.dnsname.enable = true;

     

       17
       +
             };

     

       18
       +
           };

     

       19
       +
       

     

       20
       +
           testScript = ''

     

       21
       +
             podman.wait_for_unit("sockets.target")

     

       22
       +
       

     

       23
       +
             with subtest("DNS works"): # also tests inter-container tcp routing

     

       24
       +
               podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg")

     

       25
       +
               podman.succeed(

     

       26
       +
                 "podman run -d --name=webserver -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin -w ${webroot} scratchimg ${python3}/bin/python -m http.server 8000"

     

       27
       +
               )

     

       28
       +
               podman.succeed("podman ps | grep webserver")

     

       29
       +
               podman.succeed("""

     

       30
       +
                 for i in `seq 0 120`; do

     

       31
       +
                   podman run --rm --name=client -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg ${curl}/bin/curl http://webserver:8000 >/dev/console \

     

       32
       +
                     && exit 0

     

       33
       +
                   sleep 0.5

     

       34
       +
                 done

     

       35
       +
                 exit 1

     

       36
       +
               """)

     

       37
       +
               podman.succeed("podman stop webserver")

     

       38
       +
               podman.succeed("podman rm webserver")

     

       39
       +
       

     

       40
       +
           '';

     

       41
       +
         }

     

       42
       +
       )

+4

pkgs/applications/networking/cluster/dnsname-cni/default.nix

···

       28
        
       

     

       29
        
         doCheck = false; # NOTE: requires root privileges

     

       30
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
         meta = with lib; {

     

       32
        
           description = "DNS name resolution for containers";

     

       33
        
           homepage = "https://github.com/containers/dnsname";

···

       28
        
       

     

       29
        
         doCheck = false; # NOTE: requires root privileges

     

       30
        
       

     

       31
       +
         passthru.tests = {

     

       32
       +
           inherit (nixosTests) podman-dnsname;

     

       33
       +
         };

     

       34
       +
       

     

       35
        
         meta = with lib; {

     

       36
        
           description = "DNS name resolution for containers";

     

       37
        
           homepage = "https://github.com/containers/dnsname";