Compare commits
No commits in common. "633863e7f7b4e5a091552b037067723fc979d476" and "851bc64e502a4d697caf7248e808afd52dbafde6" have entirely different histories.
633863e7f7
...
851bc64e50
@ -77,7 +77,7 @@ data:
|
||||
<alwaysPullImage>false</alwaysPullImage>
|
||||
{{- end }}
|
||||
<workingDir>/home/jenkins</workingDir>
|
||||
<command>{{ .Command | default "" }}</command>
|
||||
<command>{{ .Command | default "cat" }}</command>
|
||||
<args>{{ .Args | default "" }}</args>
|
||||
{{- if .TTY }}
|
||||
<ttyEnabled>true</ttyEnabled>
|
||||
@ -129,7 +129,7 @@ data:
|
||||
<namespace>{{ .Release.Namespace }}</namespace>
|
||||
<jenkinsUrl>http://{{ template "jenkins.fullname" . }}:{{.Values.Master.ServicePort}}{{ default "" .Values.Master.JenkinsUriPrefix }}</jenkinsUrl>
|
||||
<jenkinsTunnel>{{ template "jenkins.fullname" . }}-agent:50000</jenkinsTunnel>
|
||||
<containerCap>50</containerCap>
|
||||
<containerCap>10</containerCap>
|
||||
<retentionTimeout>5</retentionTimeout>
|
||||
<connectTimeout>0</connectTimeout>
|
||||
<readTimeout>0</readTimeout>
|
||||
|
@ -97,7 +97,6 @@ jenkins:
|
||||
Containers:
|
||||
maven:
|
||||
Image: "registry.webhosting.rug.nl/molgenis/maven"
|
||||
Command: cat
|
||||
TTY: true
|
||||
resources:
|
||||
requests:
|
||||
@ -106,11 +105,11 @@ jenkins:
|
||||
memory: "1Gi"
|
||||
alpine:
|
||||
Image: "spotify/alpine"
|
||||
Command: cat
|
||||
TTY: true
|
||||
elasticsearch:
|
||||
Image: "elasticsearch"
|
||||
ImageTag: "5.5.1"
|
||||
TTY: true
|
||||
Ports:
|
||||
- name: rest
|
||||
containerPort: "9200"
|
||||
@ -121,6 +120,7 @@ jenkins:
|
||||
postgres:
|
||||
Image: "postgres"
|
||||
ImageTag: "9.6-alpine"
|
||||
TTY: true
|
||||
Ports:
|
||||
- name: postgres
|
||||
containerPort: "5432"
|
||||
|
Loading…
Reference in New Issue
Block a user