Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions gitlab/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
'username': 'gitlab-runner',
'home': '/home/gitlab-runner',
'executor': 'shell',
'dockerimage': 'docker',
}
},
'default': {
Expand All @@ -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')) %}
2 changes: 1 addition & 1 deletion gitlab/runner.sls
Original file line number Diff line number Diff line change
Expand Up @@ -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_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
Expand Down
1 change: 1 addition & 0 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ gitlab:
token: "token gitlab-ci" # MANDATORY
home: /home/gitlab-runner
executor: shell
docker_network_mode: host