summaryrefslogtreecommitdiffstats
path: root/nixos/modules/services/continuous-integration
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-05-11 22:29:09 +0200
committerFranz Pletz <fpletz@fnordicwalking.de>2017-05-14 22:47:35 +0200
commit0cd0581b75e3e1527f0b752ec70e64c1da6d9eb5 (patch)
tree83ad533522541983f3bfba9f190e8511fdc9878e /nixos/modules/services/continuous-integration
parent482f9862e5902a7fbf57fa363bdecf5e7c84fff8 (diff)
gitlab-runner service: only depend on docker if enabled
Diffstat (limited to 'nixos/modules/services/continuous-integration')
-rw-r--r--nixos/modules/services/continuous-integration/gitlab-runner.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index ba90b1b1a2c0..048343b3360c 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -5,6 +5,7 @@ with lib;
let
cfg = config.services.gitlab-runner;
configFile = pkgs.writeText "config.toml" cfg.configText;
+ hasDocker = config.virtualisation.docker.enable;
in
{
options.services.gitlab-runner = {
@@ -33,8 +34,9 @@ in
config = mkIf cfg.enable {
systemd.services.gitlab-runner = {
description = "Gitlab Runner";
- after = [ "network.target" "docker.service" ];
- requires = [ "docker.service" ];
+ after = [ "network.target" ]
+ ++ optional hasDocker "docker.service";
+ requires = optional hasDocker "docker.service";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
@@ -51,7 +53,7 @@ in
users.extraUsers.gitlab-runner = {
group = "gitlab-runner";
- extraGroups = [ "docker" ];
+ extraGroups = optional hasDocker "docker";
uid = config.ids.uids.gitlab-runner;
home = cfg.workDir;
createHome = true;