Merge branch 'development'

This commit is contained in:
WilliamMiceli
2019-06-14 19:15:15 -04:00
2 changed files with 7 additions and 3 deletions

View File

@@ -41,7 +41,7 @@ services:
traefik.enable: false traefik.enable: false
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /Persistent/${DATA_DIR}:/etc/gitlab-runner - GitLab-Runner:/etc/gitlab-runner
gitlab-runner: gitlab-runner:
image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners
command: command:
@@ -61,4 +61,8 @@ services:
restart: always restart: always
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /Persistent/${DATA_DIR}:/etc/gitlab-runner - GitLab-Runner:/etc/gitlab-runner
volumes:
GitLab-Runner:
driver: local

View File

@@ -13,7 +13,7 @@ catalog:
label: "Host Label Key/Value Pair" label: "Host Label Key/Value Pair"
description: | description: |
(Optional) The Key/Value pair of the host which the stack should be deployed. (Optional) The Key/Value pair of the host which the stack should be deployed.
default: "host.id=Host2" default: "host.id=Host1"
required: false required: false
type: string type: string