colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #301815 from cafkafk/docker-registry-configFile

Browse Source 
nixos/dockerRegistry: add `configFile` option
This commit is contained in:
Sarah Brofeldt 2024-04-18 10:08:39 +02:00 committed by GitHub
commit 1cf797590b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/services/misc/docker-registry.nix
View File

@ -41,8 +41,7 @@ let
}; };
}; };
configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig)); configFile = cfg.configFile;
in { in {
options.services.dockerRegistry = { options.services.dockerRegistry = {
enable = mkEnableOption "Docker Registry"; enable = mkEnableOption "Docker Registry";
@ -106,6 +105,17 @@ in {
type = types.attrs; type = types.attrs;
}; };
configFile = lib.mkOption {
default = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));
defaultText = literalExpression ''pkgs.writeText "docker-registry-config.yml" "# my custom docker-registry-config.yml ..."'';
description = ''
Path to CNCF distribution config file.
Setting this option will override any configuration applied by the extraConfig option.
'';
type = types.path;
};
enableGarbageCollect = mkEnableOption "garbage collect"; enableGarbageCollect = mkEnableOption "garbage collect";
garbageCollectDates = mkOption { garbageCollectDates = mkOption {

2
nixos/tests/docker-registry.nix
View File

@ -3,7 +3,7 @@
import ./make-test-python.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ pkgs, ...} : {
name = "docker-registry"; name = "docker-registry";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ globin ironpinguin ]; maintainers = [ globin ironpinguin cafkafk ];
}; };
nodes = { nodes = {