diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-20 21:45:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 21:45:56 -0400 |
| commit | 31021701ac3346d2cd7cb339878b88b0ced4e8f1 (patch) | |
| tree | 0c4847387ef1b857a78e088923c35cd83eb3154e /nixos/modules/services/misc | |
| parent | 39250775485ad425dc10177c74db88b232f2160b (diff) | |
| parent | c4fd2b7318c7e3cdaa2467ef0a9dfc2f6c34c6fa (diff) | |
| download | nixlib-31021701ac3346d2cd7cb339878b88b0ced4e8f1.tar nixlib-31021701ac3346d2cd7cb339878b88b0ced4e8f1.tar.gz nixlib-31021701ac3346d2cd7cb339878b88b0ced4e8f1.tar.bz2 nixlib-31021701ac3346d2cd7cb339878b88b0ced4e8f1.tar.lz nixlib-31021701ac3346d2cd7cb339878b88b0ced4e8f1.tar.xz nixlib-31021701ac3346d2cd7cb339878b88b0ced4e8f1.tar.zst nixlib-31021701ac3346d2cd7cb339878b88b0ced4e8f1.zip | |
Merge pull request #41478 from bluescreen303/docker-registry
Small improvements to the docker registry module
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/docker-registry.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 45931cb42b54..f628da4ac4c0 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -42,7 +42,7 @@ let }; }; - configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (registryConfig // cfg.extraConfig)); + configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig)); in { options.services.dockerRegistry = { @@ -91,7 +91,7 @@ in { Docker extra registry configuration via environment variables. ''; default = {}; - type = types.attrsOf types.str; + type = types.attrs; }; enableGarbageCollect = mkEnableOption "garbage collect"; @@ -120,6 +120,7 @@ in { serviceConfig = { User = "docker-registry"; WorkingDirectory = cfg.storagePath; + AmbientCapabilities = mkIf (cfg.port < 1024) "cap_net_bind_service"; }; }; |