From 5ef8330051909a6971660211870ef108f88236b7 Mon Sep 17 00:00:00 2001
From: Harold Barker <git@haroldbarker.co.uk>
Date: Thu, 10 Mar 2016 23:33:51 +0000
Subject: [PATCH] Add gitlab_runner_docker_image option
---
README.md | 3 +++
defaults/main.yml | 2 ++
tasks/register-runner.yml | 1 +
3 files changed, 6 insertions(+)
diff --git a/README.md b/README.md
index 7965cd9..88d6272 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,9 @@ Defaults to the hostname.
The executor used by the runner.
Defaults to `shell`.
+`gitlab_runner_docker_image`
+The default Docker image to use. Required when executor is `docker`.
+
`gitlab_runner_tags`
The tags assigned to the runner,
Defaults to an empty list.
diff --git a/defaults/main.yml b/defaults/main.yml
index 93d0869..77a5373 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -10,5 +10,7 @@ gitlab_runner_registration_token: ''
gitlab_runner_description: '{{ ansible_hostname }}'
# Runner executor
gitlab_runner_executor: 'shell'
+# Default Docker image
+gitlab_runner_docker_image: ''
# Runner tags
gitlab_runner_tags: []
diff --git a/tasks/register-runner.yml b/tasks/register-runner.yml
index 2a315a4..5b103b7 100644
--- a/tasks/register-runner.yml
+++ b/tasks/register-runner.yml
@@ -12,4 +12,5 @@
--description '{{ gitlab_runner_description }}'
--tag-list '{{ gitlab_runner_tags | join(",") }}'
--executor '{{ gitlab_runner_executor }}'
+ --docker-image '{{ gitlab_runner_docker_image }}'
when: configured_runners.stderr.find('\n{{ gitlab_runner_description }}') == -1
--
GitLab