From 0cd0581b75e3e1527f0b752ec70e64c1da6d9eb5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 11 May 2017 22:29:09 +0200 Subject: gitlab-runner service: only depend on docker if enabled --- nixos/modules/services/continuous-integration/gitlab-runner.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'nixos/modules/services/continuous-integration/gitlab-runner.nix') diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index ba90b1b1a2c..048343b3360 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; -- cgit 1.4.1