Просмотр исходного кода

Allow overriding JVM args with an environment variable

Simon Detheridge 5 лет назад
Родитель
Сommit
f51b8139e9
2 измененных файлов с 7 добавлено и 2 удалено
  1. 1 1
      services/git-bridge/Makefile
  2. 6 1
      services/git-bridge/start.sh

+ 1 - 1
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
 

+ 6 - 1
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