Making things a bit more concise

templates/GitLab-Runner/0/docker-compose.yml

@@ -6,30 +6,23 @@ services:
     command:
       - register
       - --non-interactive
-      - --url
+      - --url ${GITLAB_URL}
-      - ${GITLAB_URL}
+      - --registration-token ${GITLAB_TOKEN}
-      - --registration-token
+      - --executor "docker"
-      - ${GITLAB_TOKEN}
-      - --executor
-      - "docker"
       {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
-      - --description
+      - --description ${GITLAB_RUNNER_DESCRIPTION}
-      - ${GITLAB_RUNNER_DESCRIPTION}
       {{- end}}
       {{- if .Values.GITLAB_TAGS}}
-      - --tag-list
+      - --tag-list ${GITLAB_TAGS}
-      - ${GITLAB_TAGS}
       {{- end}}
       - --locked=false
       - --docker-image
       - docker:latest
       - --docker-privileged
       {{- if .Values.GITLAB_IP}}
-      - --docker-extra-hosts
+      - --docker-extra-hosts "gitlab:${GITLAB_IP}"
-      - "gitlab:${GITLAB_IP}"
       {{- end}}
-      - --docker-host
+      - --docker-host "tcp://docker:2375/"
-      - "tcp://docker:2375/"
     {{- if .Values.GITLAB_LINK}}
     external_links:
       - ${GITLAB_LINK}:gitlab