From 4190dfc0ceabac91312fae35a35c96d9864540b8 Mon Sep 17 00:00:00 2001 From: Andrew Peacock Date: Wed, 12 Jul 2017 20:45:18 +0100 Subject: [PATCH] Added gitlab-runner tags parameter, pulling from GITLAB_TAGS environment variable. --- templates/gitlab-multi-runner/0/docker-compose.yml | 2 ++ templates/gitlab-multi-runner/0/rancher-compose.yml | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/templates/gitlab-multi-runner/0/docker-compose.yml b/templates/gitlab-multi-runner/0/docker-compose.yml index 82f7934..c331348 100644 --- a/templates/gitlab-multi-runner/0/docker-compose.yml +++ b/templates/gitlab-multi-runner/0/docker-compose.yml @@ -15,6 +15,8 @@ services: - ${GITLAB_URL} - --registration-token - ${GITLAB_TOKEN} + - --tag-list + - ${GITLAB_TAGS} - --executor - docker - --description diff --git a/templates/gitlab-multi-runner/0/rancher-compose.yml b/templates/gitlab-multi-runner/0/rancher-compose.yml index 4bfcd18..ab5c198 100644 --- a/templates/gitlab-multi-runner/0/rancher-compose.yml +++ b/templates/gitlab-multi-runner/0/rancher-compose.yml @@ -22,9 +22,16 @@ catalog: default: "xxxxxxxxxxxxxxxxxxxx" required: true + - variable: "GITLAB_TAGS" + label: "Gitlab Tags" + description: "Tags to apply" + type: "string" + default: "dev" + required: false + services: gitlab-runner-config: scale: 1 start_on_create: true gitlab-runner: - start_on_create: true \ No newline at end of file + start_on_create: true