commit d5851d56761da0750ade90bc4a693d414671b045 · pyrox.dev/nixpkgs

+12 -2

nixos/modules/services/misc/docker-registry.nix

···

       41
       41
        
           };

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
       -
         configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));

     

       45
       45
       -
       

     

       44
       44
       +
         configFile = cfg.configFile;

     

       46
       45
        
       in {

     

       47
       46
        
         options.services.dockerRegistry = {

     

       48
       47
        
           enable = mkEnableOption "Docker Registry";

     
···

       104
       103
        
             '';

     

       105
       104
        
             default = {};

     

       106
       105
        
             type = types.attrs;

     

       106
       106
       +
           };

     

       107
       107
       +
       

     

       108
       108
       +
           configFile = lib.mkOption {

     

       109
       109
       +
             default = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));

     

       110
       110
       +
             defaultText = literalExpression ''pkgs.writeText "docker-registry-config.yml" "# my custom docker-registry-config.yml ..."'';

     

       111
       111
       +
             description = ''

     

       112
       112
       +
              Path to CNCF distribution config file.

     

       113
       113
       +
       

     

       114
       114
       +
              Setting this option will override any configuration applied by the extraConfig option.

     

       115
       115
       +
             '';

     

       116
       116
       +
             type =  types.path;

     

       107
       117
        
           };

     

       108
       118
        
       

     

       109
       119
        
           enableGarbageCollect = mkEnableOption "garbage collect";

+1 -1

nixos/tests/docker-registry.nix

···

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

     

       4
       4
        
         name = "docker-registry";

     

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

     

       6
       6
       -
           maintainers = [ globin ironpinguin ];

     

       6
       6
       +
           maintainers = [ globin ironpinguin cafkafk ];

     

       7
       7
        
         };

     

       8
       8
        
       

     

       9
       9
        
         nodes = {