From d7ecb40d60724e43d4c346d657359bad75500c99 Mon Sep 17 00:00:00 2001 From: WilliamMiceli Date: Fri, 15 Mar 2019 09:50:58 -0400 Subject: [PATCH] Revert "Testing more condensed style" This reverts commit 2ece97ced346e3d38d56de33c2d24f24a997ff9d. # Conflicts: # templates/GitLab-Runner/0/docker-compose.yml --- templates/GitLab-Runner/0/docker-compose.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml index 2b2bac7..6830137 100644 --- a/templates/GitLab-Runner/0/docker-compose.yml +++ b/templates/GitLab-Runner/0/docker-compose.yml @@ -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 \ No newline at end of file + - /RancherCattle/${DATA_DIR}:/etc/gitlab-runner