Merge pull request #227 from indrat/docker-helper-image

Enable setting the helper_image option for docker executors

defaults/main.yml

@@ -79,6 +79,9 @@ gitlab_runner_runners:
     concurrent_specific: '0'
     # The default Docker image to use. Required when executor is `docker`.
     docker_image: ''
+    # Set to override the default helper image that is used.
+    # docker_helper_image: 'gitlab/gitlab-runner-helper-linux:latest'
+    #
     # The tags assigned to the runner.
     tags: []
     # Indicates whether this runner can pick jobs without tags.

tasks/register-runner.yml

@@ -64,6 +64,9 @@
       --post-build-script "{{ gitlab_runner.post_build_script }}"
       {% endif %}
       --docker-image '{{ gitlab_runner.docker_image|default("alpine") }}'
+      {% if gitlab_runner.docker_helper_image is defined %}
+      --docker-helper-image "{{ gitlab_runner.docker_helper_image }}"
+      {% endif %}
       {% if gitlab_runner.docker_privileged|default(false) %}
       --docker-privileged
       {% endif %}

tasks/update-config-runner.yml

@@ -175,6 +175,19 @@
   - restart_gitlab_runner
   - restart_gitlab_runner_macos
 
+- name:  "{{ runn_name_prefix }} Set docker helper image option"
+  lineinfile:
+    dest: "{{ temp_runner_config.path }}"
+    regexp: '^\s*helper_image ='
+    line: '    helper_image = {{ gitlab_runner.docker_helper_image|default('') | to_json }}'
+    state: "{{ 'present' if gitlab_runner.docker_helper_image is defined else 'absent' }}"
+    insertafter: '^\s*\[runners\.docker\]'
+    backrefs: no
+  check_mode: no
+  notify:
+  - restart_gitlab_runner
+  - restart_gitlab_runner_macos
+
 - name:  "{{ runn_name_prefix }} Set docker privileged option"
   lineinfile:
     dest: "{{ temp_runner_config.path }}"