From f51b8139e96c570198cd89e747550f2a358ce27d Mon Sep 17 00:00:00 2001 From: Simon Detheridge Date: Wed, 23 Jun 2021 12:43:00 +0100 Subject: [PATCH] Allow overriding JVM args with an environment variable --- services/git-bridge/Makefile | 2 +- services/git-bridge/start.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/services/git-bridge/Makefile b/services/git-bridge/Makefile index bea353f6cd..b3b2c06fef 100644 --- a/services/git-bridge/Makefile +++ b/services/git-bridge/Makefile @@ -7,7 +7,7 @@ runtime-conf: run: package runtime-conf - java -jar \ + java $(GIT_BRIDGE_JVM_ARGS) -jar \ target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar \ conf/runtime.json diff --git a/services/git-bridge/start.sh b/services/git-bridge/start.sh index 68bcc09a0a..bb4dd362be 100755 --- a/services/git-bridge/start.sh +++ b/services/git-bridge/start.sh @@ -1,3 +1,8 @@ #!/bin/bash /opt/envsubst < /envsubst_template.json > /conf/runtime.json -exec java -XX:+UseContainerSupport -XX:MaxRAMPercentage=50.0 -Xlog:gc* -jar /git-bridge.jar /conf/runtime.json + +if [ "x$GIT_BRIDGE_JVM_ARGS" == "x" ]; then + GIT_BRIDGE_JVM_ARGS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=50.0" +fi + +exec java $GIT_BRIDGE_JVM_ARGS -jar /git-bridge.jar /conf/runtime.json