William/Personal-Rancher-Catalog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Testing more condensed style"

Browse Source 
This reverts commit 2ece97ced3.

# Conflicts:
#	templates/GitLab-Runner/0/docker-compose.yml
This commit is contained in:
WilliamMiceli
2019-03-15 09:50:58 -04:00
parent 0f8f172146
commit d7ecb40d60
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/GitLab-Runner/0/docker-compose.yml
View File

@@ -6,15 +6,21 @@ services:
command: command:
- register - register
- --non-interactive - --non-interactive
- '--url ${GITLAB_URL}' - --url
- '--registration-token ${GITLAB_TOKEN}' - ${GITLAB_URL}
- '--executor "docker"' - --registration-token
- '--docker-image alpine:latest' - ${GITLAB_TOKEN}
- --executor
- "docker"
- --docker-image
- alpine:latest
{{- if .Values.GITLAB_RUNNER_DESCRIPTION}} {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
- '--description ${GITLAB_RUNNER_DESCRIPTION}' - --description
- ${GITLAB_RUNNER_DESCRIPTION}
{{- end}} {{- end}}
{{- if .Values.GITLAB_TAGS}} {{- if .Values.GITLAB_TAGS}}
- '--tag-list ${GITLAB_TAGS}' - --tag-list
- ${GITLAB_TAGS}
{{- end}} {{- end}}
- --run-untagged - --run-untagged
- --locked=false - --locked=false