[improve] support master custom java opts (apache#2634)

Co-authored-by: shown <[email protected]>
Aias00 · Aug 29, 2024 · 0d73ac6 · 0d73ac6
1 parent 17636ed
commit 0d73ac6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/script/assembly/server/bin/entrypoint.sh b/script/assembly/server/bin/entrypoint.sh
@@ -46,7 +46,11 @@ if [ ! -d $LOGS_DIR ]; then
 fi
 
 # JVM Configuration
-JAVA_OPTS=" -Doracle.jdbc.timezoneAsRegion=false"
+if [ -z "$JAVA_OPTS" ]; then
+  JAVA_OPTS=" -Doracle.jdbc.timezoneAsRegion=false"
+else
+  JAVA_OPTS="${JAVA_OPTS} -Doracle.jdbc.timezoneAsRegion=false"
+fi
 
 # JVM Configuration
 JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOGS_DIR"

diff --git a/script/docker/collector/Dockerfile b/script/docker/collector/Dockerfile
@@ -25,6 +25,7 @@ RUN mkdir /var/run/sshd
 
 ADD apache-hertzbeat-collector-*-incubating-bin.tar.gz /opt/
 
+ENV JAVA_OPTS ""
 ENV TZ=Asia/Shanghai
 ENV LANG=en_US.UTF-8