diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile index 597ffa6950..0c28bfe5fa 100644 --- a/services/git-bridge/Dockerfile +++ b/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 diff --git a/services/git-bridge/pom.xml b/services/git-bridge/pom.xml index 3cfe0454b7..e02cc6dce7 100644 --- a/services/git-bridge/pom.xml +++ b/services/git-bridge/pom.xml @@ -167,7 +167,7 @@ org.mockito mockito-core - 2.13.0 + 3.11.1 test diff --git a/services/git-bridge/start.sh b/services/git-bridge/start.sh index 1914603a4d..68bcc09a0a 100755 --- a/services/git-bridge/start.sh +++ b/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