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

Merge pull request #105 from overleaf/spd-update-and-debug

Update JVM and add GC logging
Simon Detheridge 5 лет назад
Родитель
Сommit
d5fa029b54
3 измененных файлов с 5 добавлено и 5 удалено
  1. 3 3
      services/git-bridge/Dockerfile
  2. 1 1
      services/git-bridge/pom.xml
  3. 1 1
      services/git-bridge/start.sh

+ 3 - 3
services/git-bridge/Dockerfile

@@ -1,6 +1,6 @@
 # Dockerfile for git-bridge
 
-FROM maven:3-jdk-8 as base
+FROM maven:3-jdk-11 as base
 
 RUN apt-get update && apt-get install -y make git \
  && rm -rf /var/lib/apt/lists
@@ -23,9 +23,9 @@ RUN make package \
       -name 'writelatex-git-bridge*jar-with-dependencies.jar' \
       -exec mv {} /git-bridge.jar \;
 
-FROM openjdk:8-jre
+FROM openjdk:11-jre
 
-RUN apt-get update && apt-get install -y git sqlite3 \
+RUN apt-get update && apt-get install -y git sqlite3 procps htop net-tools sockstat \
  && rm -rf /var/lib/apt/lists
 
 RUN useradd --create-home node

+ 1 - 1
services/git-bridge/pom.xml

@@ -167,7 +167,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.13.0</version>
+            <version>3.11.1</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.amazonaws/aws-java-sdk -->

+ 1 - 1
services/git-bridge/start.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 /opt/envsubst < /envsubst_template.json > /conf/runtime.json
-exec java -XX:+UseContainerSupport -XX:MaxRAMPercentage=50.0 -jar /git-bridge.jar /conf/runtime.json
+exec java -XX:+UseContainerSupport -XX:MaxRAMPercentage=50.0 -Xlog:gc* -jar /git-bridge.jar /conf/runtime.json