William/Personal-Rancher-Catalog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Testing simplified template config

Browse Source
This commit is contained in:
WilliamMiceli
2019-11-10 17:22:30 -05:00
parent 81834228c6
commit 2bc2400f5b
2 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
templates/GitLab-Runner/0/docker-compose.yml
View File

@@ -7,7 +7,7 @@ services:
- register
environment: # Options can be found by running "gitlab-runner register". More info found at https://docs.gitlab.com/runner/configuration/advanced-configuration.html
REGISTER_NON_INTERACTIVE: true # Run registration unattended
CI_SERVER_URL: http://gitlab/ # Runner URL
CI_SERVER_URL: http://${GITLAB_HOST}/ # GitLab Server URL
REGISTRATION_TOKEN: ${GITLAB_TOKEN} # Runner's registration token
RUNNER_EXECUTOR: docker # Select executor, eg. shell, docker, etc.
{{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
@@ -18,12 +18,7 @@ services:
{{- end}}
REGISTER_LOCKED: false # Lock Runner for current project
DOCKER_IMAGE: docker:latest # Docker image to be used
DOCKER_EXTRA_HOSTS: gitlab:${GITLAB_IP} # Add local alias for GitLab instance within Rancher network
DOCKER_VOLUMES: "/var/run/docker.sock:/var/run/docker.sock" # Docker Socket binding
external_links:
{{- if .Values.GITLAB_LINK}}
- ${GITLAB_LINK}:gitlab
{{- end}}
labels:
io.rancher.container.pull_image: always
io.rancher.container.start_once: true
@@ -39,7 +34,7 @@ services:
- run
environment: # Options can be found by running "gitlab-runner register". More info found at https://docs.gitlab.com/runner/configuration/advanced-configuration.html
REGISTER_NON_INTERACTIVE: true # Run registration unattended
CI_SERVER_URL: http://gitlab/ # Runner URL
CI_SERVER_URL: http://${GITLAB_HOST}/ # GitLab Server URL
REGISTRATION_TOKEN: ${GITLAB_TOKEN} # Runner's registration token
RUNNER_EXECUTOR: docker # Select executor, eg. shell, docker, etc.
{{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
@@ -50,12 +45,7 @@ services:
{{- end}}
REGISTER_LOCKED: false # Lock Runner for current project
DOCKER_IMAGE: docker:latest # Docker image to be used
DOCKER_EXTRA_HOSTS: gitlab:${GITLAB_IP} # Add local alias for GitLab instance within Rancher network
DOCKER_VOLUMES: "/var/run/docker.sock:/var/run/docker.sock" # Docker Socket binding
{{- if .Values.GITLAB_LINK}}
external_links:
- ${GITLAB_LINK}:gitlab
{{- end}}
labels:
io.rancher.container.pull_image: always
{{- if .Values.HOST_LABEL}}

26
templates/GitLab-Runner/0/rancher-compose.yml
View File

@@ -17,12 +17,11 @@ catalog:
required: false
type: string
- variable: "GITLAB_URL"
label: "GitLab URL"
- variable: "GITLAB_HOST"
label: "GitLab Server Hostname/IP"
description: |
The URL which your GitLab instance can be reached at.
You can use the service selection and alias to create a direct link if it is in your Rancher environment.
default: "http://gitlab/"
The Hostname/IP which your GitLab instance can be reached at.
default: "gitlab.com"
required: true
type: string
@@ -49,19 +48,4 @@ catalog:
These can be changed later in GitLab.
default: "docker"
required: false
type: string
- variable: "GITLAB_LINK"
label: "GitLab Service"
description: |
(Optional) Create a direct link to the GitLab service.
required: false
type: service
- variable: "GITLAB_IP"
label: "Local GitLab IP"
description: |
(Optional) The local IP address of the GitLab service.
# default: ""
required: false
type: string
type: string