mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/jenkins] fix parsing java options (#10140)
Java options are stored in env var JAVA_TOOL_OPTIONS however the
entrypoint shell script of the docker image expects them in env var JAVA_OPTS
# read JAVA_OPTS and JENKINS_OPTS into arrays to avoid need for eval (and associated vulnerabilities)
java_opts_array=()
while IFS= read -r -d '' item; do
java_opts_array+=( "$item" )
done < <([[ $JAVA_OPTS ]] && xargs printf '%s\0' <<<"$JAVA_OPTS")
Signed-off-by: Atanas Zhelev <azhelev+github@mailbox.org>
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
6b9506506f
commit
9448d0293b
@@ -1,6 +1,6 @@
|
||||
name: jenkins
|
||||
home: https://jenkins.io/
|
||||
version: 0.28.2
|
||||
version: 0.28.3
|
||||
appVersion: lts
|
||||
description: Open source continuous integration server. It supports multiple SCM tools
|
||||
including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based
|
||||
|
||||
@@ -113,7 +113,7 @@ spec:
|
||||
args: [ "--argumentsRealm.passwd.$(ADMIN_USER)=$(ADMIN_PASSWORD)", "--argumentsRealm.roles.$(ADMIN_USER)=admin"]
|
||||
{{- end }}
|
||||
env:
|
||||
- name: JAVA_TOOL_OPTIONS
|
||||
- name: JAVA_OPTS
|
||||
value: "{{ default "" .Values.Master.JavaOpts}}"
|
||||
- name: JENKINS_OPTS
|
||||
value: "{{ if .Values.Master.JenkinsUriPrefix }}--prefix={{ .Values.Master.JenkinsUriPrefix }} {{ end }}{{ default "" .Values.Master.JenkinsOpts}}"
|
||||
|
||||
Reference in New Issue
Block a user