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

gitlab-runner service: only depend on docker if enabled

Browse Source
This commit is contained in:
Franz Pletz 2017-05-11 22:29:09 +02:00
parent 482f9862e5
commit 0cd0581b75
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/continuous-integration/gitlab-runner.nix
View File

@ -5,6 +5,7 @@ with lib;
let let
cfg = config.services.gitlab-runner; cfg = config.services.gitlab-runner;
configFile = pkgs.writeText "config.toml" cfg.configText; configFile = pkgs.writeText "config.toml" cfg.configText;
hasDocker = config.virtualisation.docker.enable;
in in
{ {
options.services.gitlab-runner = { options.services.gitlab-runner = {
@ -33,8 +34,9 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.services.gitlab-runner = { systemd.services.gitlab-runner = {
description = "Gitlab Runner"; description = "Gitlab Runner";
after = [ "network.target" "docker.service" ]; after = [ "network.target" ]
requires = [ "docker.service" ]; ++ optional hasDocker "docker.service";
requires = optional hasDocker "docker.service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \ ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
@ -51,7 +53,7 @@ in
users.extraUsers.gitlab-runner = { users.extraUsers.gitlab-runner = {
group = "gitlab-runner"; group = "gitlab-runner";
extraGroups = [ "docker" ]; extraGroups = optional hasDocker "docker";
uid = config.ids.uids.gitlab-runner; uid = config.ids.uids.gitlab-runner;
home = cfg.workDir; home = cfg.workDir;
createHome = true; createHome = true;