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

Full URL needed now for HTTPS connections

Browse Source
This commit is contained in:
WilliamMiceli
2019-11-12 11:39:07 -05:00
parent b60b2f32d3
commit 3347355bdf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ services:
- run - run
environment: # Options can be found by running "gitlab-runner register". More info found at https://docs.gitlab.com/runner/configuration/advanced-configuration.html 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 REGISTER_NON_INTERACTIVE: true # Run registration unattended
CI_SERVER_URL: http://${GITLAB_HOST}/ # GitLab Server URL CI_SERVER_URL: ${GITLAB_URL} # GitLab Server URL
REGISTRATION_TOKEN: ${GITLAB_TOKEN} # Runner's registration token REGISTRATION_TOKEN: ${GITLAB_TOKEN} # Runner's registration token
RUNNER_EXECUTOR: docker # Select executor, eg. shell, docker, etc. RUNNER_EXECUTOR: docker # Select executor, eg. shell, docker, etc.
{{- if .Values.GITLAB_RUNNER_DESCRIPTION}} {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}

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

@@ -17,11 +17,11 @@ catalog:
required: false required: false
type: string type: string
- variable: "GITLAB_HOST" - variable: "GITLAB_URL"
label: "GitLab Server Hostname/IP" label: "GitLab Server URL"
description: | description: |
The Hostname/IP which your GitLab instance can be reached at. The URL which your GitLab instance can be reached at.
default: "gitlab.com" default: "https://gitlab.com"
required: true required: true
type: string type: string