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

Removed link alias to simplify

Browse Source
This commit is contained in:
William Miceli
2019-05-04 14:57:13 -04:00
parent 8c551fb483
commit 67a6039f88
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ services:
{{- end}} {{- end}}
{{- if .Values.GITLAB_LINK}} {{- if .Values.GITLAB_LINK}}
external_links: external_links:
- ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}} - ${GITLAB_LINK}:gitlab
{{- end}} {{- end}}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always
@@ -48,7 +48,7 @@ services:
- run - run
{{- if .Values.GITLAB_LINK}} {{- if .Values.GITLAB_LINK}}
external_links: external_links:
- ${GITLAB_LINK}{{- if .Values.GITLAB_LINK_ALIAS}}:${GITLAB_LINK_ALIAS}{{- end}} - ${GITLAB_LINK}:gitlab
{{- end}} {{- end}}
labels: labels:
io.rancher.container.pull_image: always io.rancher.container.pull_image: always

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

@@ -58,14 +58,6 @@ catalog:
required: false required: false
type: service type: service
- variable: "GITLAB_LINK_ALIAS"
label: "GitLab Service Alias"
description: |
(Optional) Create an alias for the service.
default: "gitlab"
required: false
type: string
- variable: "GITLAB_IP" - variable: "GITLAB_IP"
label: "Local GitLab IP" label: "Local GitLab IP"
description: | description: |