diff options
| author | Christina Sørensen <christina@cafkafk.com> | 2024-04-05 13:27:22 +0200 |
|---|---|---|
| committer | Christina Sørensen <christina@cafkafk.com> | 2024-04-18 06:11:06 +0200 |
| commit | d5851d56761da0750ade90bc4a693d414671b045 (patch) | |
| tree | ba472b338c681e63fdcf1576b659215d8a8b47b5 /nixos | |
| parent | 2948912cdede361087742c672ff921cd80ac9ec2 (diff) | |
nixos/dockerRegistry: add `configFile` option
defaultText based on how nixos/modules/services/development/athens.nix does it. Signed-off-by: Christina Sørensen <christina@cafkafk.com>
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/docker-registry.nix | 14 | ||||
| -rw-r--r-- | nixos/tests/docker-registry.nix | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index a2764abd993e6..93bf71ea3ecc1 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -41,8 +41,7 @@ let }; }; - configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig)); - + configFile = cfg.configFile; in { options.services.dockerRegistry = { enable = mkEnableOption "Docker Registry"; @@ -106,6 +105,17 @@ in { 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"; garbageCollectDates = mkOption { diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index 3969ef3f0226f..4f033fc30b191 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "docker-registry"; meta = with pkgs.lib.maintainers; { - maintainers = [ globin ironpinguin ]; + maintainers = [ globin ironpinguin cafkafk ]; }; nodes = { |