Merge branch 'master' of P129679/molgenis-ops-docker-helm into master
This commit is contained in:
commit
4ad7d69169
@ -143,7 +143,7 @@ data:
|
|||||||
{{- else }}
|
{{- else }}
|
||||||
<alwaysPullImage>false</alwaysPullImage>
|
<alwaysPullImage>false</alwaysPullImage>
|
||||||
{{- end }}
|
{{- end }}
|
||||||
<workingDir>/home/jenkins</workingDir>
|
<workingDir>{{ .WorkingDir | default "" }}</workingDir>
|
||||||
<command>{{ .Command | default "" }}</command>
|
<command>{{ .Command | default "" }}</command>
|
||||||
<args>{{ .Args | default "" }}</args>
|
<args>{{ .Args | default "" }}</args>
|
||||||
{{- if .TTY }}
|
{{- if .TTY }}
|
||||||
|
@ -210,6 +210,7 @@ jenkins:
|
|||||||
maven:
|
maven:
|
||||||
Image: "registry.webhosting.rug.nl/molgenis/maven"
|
Image: "registry.webhosting.rug.nl/molgenis/maven"
|
||||||
Command: cat
|
Command: cat
|
||||||
|
WorkingDir: /home/jenkins
|
||||||
TTY: true
|
TTY: true
|
||||||
resources:
|
resources:
|
||||||
requests:
|
requests:
|
||||||
@ -218,11 +219,13 @@ jenkins:
|
|||||||
alpine:
|
alpine:
|
||||||
Image: "spotify/alpine"
|
Image: "spotify/alpine"
|
||||||
Command: cat
|
Command: cat
|
||||||
|
WorkingDir: /home/jenkins
|
||||||
TTY: true
|
TTY: true
|
||||||
node:
|
node:
|
||||||
Image: "node"
|
Image: "node"
|
||||||
ImageTag: "9.11.2"
|
ImageTag: "9.11.2"
|
||||||
Command: cat
|
Command: cat
|
||||||
|
WorkingDir: /home/jenkins
|
||||||
TTY: true
|
TTY: true
|
||||||
EnvVars:
|
EnvVars:
|
||||||
- type: Secret
|
- type: Secret
|
||||||
|
Loading…
Reference in New Issue
Block a user