flywithu/community-catalog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

review fixes

Browse Source
This commit is contained in:
Tayyeb 2017-08-02 01:43:48 +04:30
parent c1e33ae921
commit 69539807d5
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/gitlab-multi-runner/1/docker-compose.yml → templates/gitlab-multi-runner/1/docker-compose.yml.tpl
View File

@ -27,7 +27,6 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- --docker-privileged - --docker-privileged
labels: labels:
io.rancher.container.pull_image: always
io.rancher.container.start_once: 'true' io.rancher.container.start_once: 'true'
gitlab-runner: gitlab-runner:
@ -42,5 +41,7 @@ services:
- run - run
labels: labels:
io.rancher.sidekicks: gitlab-runner-config io.rancher.sidekicks: gitlab-runner-config
io.rancher.container.pull_image: always
io.rancher.scheduler.global: 'true' io.rancher.scheduler.global: 'true'
{{- if ne .Values.host_label ""}}
io.rancher.scheduler.affinity:host_label: ${host_label}
{{- end}}

10
templates/gitlab-multi-runner/1/rancher-compose.yml
View File

@ -29,9 +29,17 @@ catalog:
default: "dev" default: "dev"
required: false required: false
- variable: "host_label"
label: "Host with Label to deploy gitlab-runner on"
description: |
Host label to use as gitlab-runner 'value' tag.
Example: 'gitlab-runner=true'
type: "string"
default: ""
required: false
services: services:
gitlab-runner-config: gitlab-runner-config:
scale: 1
start_on_create: true start_on_create: true
gitlab-runner: gitlab-runner:
start_on_create: true start_on_create: true