summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2017-08-30 18:52:17 +0200
committerGitHub <noreply@github.com>2017-08-30 18:52:17 +0200
commitb5a95f628981ed49350e2558c90939d1fcbc2326 (patch)
tree5d07b337a844bf6fc089a4ac41285a9d3559bd14
parentee34c2e72fee7aa2eab36bbca8b563368e2ecff1 (diff)
parent233781410d15a4a38e4ef86f6b47ed2435be94b9 (diff)
downloadnixlib-b5a95f628981ed49350e2558c90939d1fcbc2326.tar
nixlib-b5a95f628981ed49350e2558c90939d1fcbc2326.tar.gz
nixlib-b5a95f628981ed49350e2558c90939d1fcbc2326.tar.bz2
nixlib-b5a95f628981ed49350e2558c90939d1fcbc2326.tar.lz
nixlib-b5a95f628981ed49350e2558c90939d1fcbc2326.tar.xz
nixlib-b5a95f628981ed49350e2558c90939d1fcbc2326.tar.zst
nixlib-b5a95f628981ed49350e2558c90939d1fcbc2326.zip
Merge pull request #28741 from bachp/gitlab-runner-improve
Gitlab runner improve
-rw-r--r--nixos/modules/services/continuous-integration/gitlab-runner.nix11
1 files changed, 11 insertions, 0 deletions
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index ce0583dad54d..6d5cea4f77a5 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -96,10 +96,21 @@ in
       example = literalExample "pkgs.gitlab-runner_1_11";
     };
 
+    packages = mkOption {
+      default = [ pkgs.bash pkgs.docker-machine ];
+      defaultText = "[ pkgs.bash pkgs.docker-machine ]";
+      type = types.listOf types.package;
+      description = ''
+        Packages to add to PATH for the gitlab-runner process.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {
     systemd.services.gitlab-runner = {
+      path = cfg.packages;
+      environment = config.networking.proxy.envVars;
       description = "Gitlab Runner";
       after = [ "network.target" ]
         ++ optional hasDocker "docker.service";