Skip to content

Small improvements to the docker registry module #41478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthewbauer merged 2 commits into from
Jun 21, 2018
Merged

Small improvements to the docker registry module #41478

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f1ad29
nixos/docker-registry: allow nested config options
bluescreen303 Jun 5, 2018
c4fd2b7
nixos/docker-registry: allow running on ports < 1024
bluescreen303 Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions nixos/modules/services/misc/docker-registry.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -120,6 +120,7 @@ in {
serviceConfig = {
User = "docker-registry";
WorkingDirectory = cfg.storagePath;
AmbientCapabilities = mkIf (cfg.port < 1024) "cap_net_bind_service";
};
};

Expand Down