Revert "Testing more condensed style"

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

View File

@@ -6,15 +6,21 @@ services:
command:
- register
- --non-interactive
- '--url ${GITLAB_URL}'
- '--registration-token ${GITLAB_TOKEN}'
- '--executor "docker"'
- '--docker-image alpine:latest'
- --url
- ${GITLAB_URL}
- --registration-token
- ${GITLAB_TOKEN}
- --executor
- "docker"
- --docker-image
- alpine:latest
{{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
- '--description ${GITLAB_RUNNER_DESCRIPTION}'
- --description
- ${GITLAB_RUNNER_DESCRIPTION}
{{- end}}
{{- if .Values.GITLAB_TAGS}}
- '--tag-list ${GITLAB_TAGS}'
- --tag-list
- ${GITLAB_TAGS}
{{- end}}
- --run-untagged
- --locked=false
@@ -50,4 +56,4 @@ services:
restart: on-failure
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /RancherCattle/${DATA_DIR}:/etc/gitlab-runner
- /RancherCattle/${DATA_DIR}:/etc/gitlab-runner