From 156c80739636b5515b129f66e13ecb4c7c9cc8cb Mon Sep 17 00:00:00 2001 From: kartnico Date: Sat, 1 Jan 2022 14:39:16 +0100 Subject: [PATCH 1/3] fix(runner): add required docker image name for gitlab-runner register command --- gitlab/map.jinja | 2 ++ gitlab/runner.sls | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gitlab/map.jinja b/gitlab/map.jinja index 20fcd8e..2564ba1 100644 --- a/gitlab/map.jinja +++ b/gitlab/map.jinja @@ -5,6 +5,7 @@ 'username': 'gitlab-runner', 'home': '/home/gitlab-runner', 'executor': 'shell', + 'dockerimage': 'docker', } }, 'default': { @@ -13,6 +14,7 @@ 'downloadpath': 'https://packages.gitlab.com/runner/gitlab-runner/packages/linuxmint/sonya/gitlab-runner_10.4.0_amd64.deb/download', 'home': '/home/gitlab-runner', 'executor': 'shell', + 'dockerimage': 'docker', } }, }, merge=salt['pillar.get']('gitlab')) %} diff --git a/gitlab/runner.sls b/gitlab/runner.sls index 1d47b60..dfd691b 100644 --- a/gitlab/runner.sls +++ b/gitlab/runner.sls @@ -41,7 +41,7 @@ gitlab-install_runserver_create_user: gitlab-install_runserver3: cmd.run: - - name: "CI_SERVER_URL='{{gitlab.runner.url}}' REGISTRATION_TOKEN='{{gitlab.runner.token}}' RUNNER_EXECUTOR='{{gitlab.runner.executor}}' /usr/bin/gitlab-runner register --non-interactive" + - name: "CI_SERVER_URL='{{gitlab.runner.url}}' REGISTRATION_TOKEN='{{gitlab.runner.token}}' RUNNER_EXECUTOR='{{gitlab.runner.executor}}'{% if gitlab.runner.executor == "docker" %} DOCKER_IMAGE='{{gitlab.runner.dockerimage}}'{% endif %} /usr/bin/gitlab-runner register --non-interactive" - creates: /etc/gitlab-runner/config.toml - require: - user: gitlab-install_runserver_create_user From 1fc61c270ba7322871937e103e0d48769b8fcd4f Mon Sep 17 00:00:00 2001 From: kartnico Date: Sat, 15 Jan 2022 22:38:05 +0100 Subject: [PATCH 2/3] feat(runner): add docker_network_mode parameter for gitlab-runner register command --- gitlab/runner.sls | 2 +- pillar.example | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gitlab/runner.sls b/gitlab/runner.sls index dfd691b..fbba9ea 100644 --- a/gitlab/runner.sls +++ b/gitlab/runner.sls @@ -41,7 +41,7 @@ gitlab-install_runserver_create_user: gitlab-install_runserver3: cmd.run: - - name: "CI_SERVER_URL='{{gitlab.runner.url}}' REGISTRATION_TOKEN='{{gitlab.runner.token}}' RUNNER_EXECUTOR='{{gitlab.runner.executor}}'{% if gitlab.runner.executor == "docker" %} DOCKER_IMAGE='{{gitlab.runner.dockerimage}}'{% endif %} /usr/bin/gitlab-runner register --non-interactive" + - name: "CI_SERVER_URL='{{gitlab.runner.url}}' REGISTRATION_TOKEN='{{gitlab.runner.token}}' RUNNER_EXECUTOR='{{gitlab.runner.executor}}'{% if gitlab.runner.executor == "docker" %} DOCKER_IMAGE='{{gitlab.runner.dockerimage}}'{% if gitlab.runner.docker_network_mode is defined %} DOCKER_NETWORK_MODE='{{gitlab.runner.docker_network_mode}}'{% endif %}{% endif %} /usr/bin/gitlab-runner register --non-interactive" - creates: /etc/gitlab-runner/config.toml - require: - user: gitlab-install_runserver_create_user diff --git a/pillar.example b/pillar.example index f33e44d..871a6b3 100644 --- a/pillar.example +++ b/pillar.example @@ -62,3 +62,4 @@ gitlab: token: "token gitlab-ci" # MANDATORY home: /home/gitlab-runner executor: shell + docker_network_mode: host From ad69bf020c1e8f5e60e8fc56f778b40749063772 Mon Sep 17 00:00:00 2001 From: kartnico Date: Sun, 26 Jun 2022 18:41:50 +0200 Subject: [PATCH 3/3] feat(runner): force privileged mode --- gitlab/runner.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab/runner.sls b/gitlab/runner.sls index fbba9ea..9609ffa 100644 --- a/gitlab/runner.sls +++ b/gitlab/runner.sls @@ -41,7 +41,7 @@ gitlab-install_runserver_create_user: gitlab-install_runserver3: cmd.run: - - name: "CI_SERVER_URL='{{gitlab.runner.url}}' REGISTRATION_TOKEN='{{gitlab.runner.token}}' RUNNER_EXECUTOR='{{gitlab.runner.executor}}'{% if gitlab.runner.executor == "docker" %} DOCKER_IMAGE='{{gitlab.runner.dockerimage}}'{% if gitlab.runner.docker_network_mode is defined %} DOCKER_NETWORK_MODE='{{gitlab.runner.docker_network_mode}}'{% endif %}{% endif %} /usr/bin/gitlab-runner register --non-interactive" + - name: "CI_SERVER_URL='{{gitlab.runner.url}}' REGISTRATION_TOKEN='{{gitlab.runner.token}}' RUNNER_EXECUTOR='{{gitlab.runner.executor}}'{% if gitlab.runner.executor == "docker" %} DOCKER_PRIVILEGED='true' DOCKER_IMAGE='{{gitlab.runner.dockerimage}}'{% if gitlab.runner.docker_network_mode is defined %} DOCKER_NETWORK_MODE='{{gitlab.runner.docker_network_mode}}'{% endif %}{% endif %} /usr/bin/gitlab-runner register --non-interactive" - creates: /etc/gitlab-runner/config.toml - require: - user: gitlab-install_runserver_create_user