diff options
| author | misuzu <bakalolka@gmail.com> | 2021-01-26 02:01:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 00:01:54 +0000 |
| commit | 1e38f0bdf98e1089f8387c2845dbb7bf1fbcad04 (patch) | |
| tree | d8f9d94a7f8b776ba5083371c152221858d80595 /nixos | |
| parent | 896a3428ecaea3a87ef456dded3cb8c67089b0dd (diff) | |
nixos/gitlab-runner: add support for 'docker+machine' and 'docker-ssh+machine' executors (#108763)
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/continuous-integration/gitlab-runner.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index c358a5db77c2..2c6d9530a6b8 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -66,10 +66,10 @@ let ++ optional service.debugTraceDisabled "--debug-trace-disabled" ++ map (e: "--env ${escapeShellArg e}") (mapAttrsToList (name: value: "${name}=${value}") service.environmentVariables) - ++ optionals (service.executor == "docker") ( + ++ optionals (hasPrefix "docker" service.executor) ( assert ( assertMsg (service.dockerImage != null) - "dockerImage option is required for docker executor (${name})"); + "dockerImage option is required for ${service.executor} executor (${name})"); [ "--docker-image ${service.dockerImage}" ] ++ optional service.dockerDisableCache "--docker-disable-cache" |