From 9ef4d1ee5cfe0b3573f879666c03c69ccf9d8185 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <s@sd.ai>
Date: Mon, 21 Jun 2021 10:57:16 +0100
Subject: [PATCH 1/4] Update Java to 11

---
 services/git-bridge/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile
index 597ffa6950..f6c63abeb7 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,7 +23,7 @@ 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 \
  && rm -rf /var/lib/apt/lists

From bce5af615fe17be0477d851c2ddd7beaff2cae89 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <s@sd.ai>
Date: Mon, 21 Jun 2021 10:58:00 +0100
Subject: [PATCH 2/4] Add gc logging to the Git Bridge

---
 services/git-bridge/start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 600939301357b4b3b96688ff6267f005a6c3439b Mon Sep 17 00:00:00 2001
From: Simon Detheridge <s@sd.ai>
Date: Mon, 21 Jun 2021 11:02:29 +0100
Subject: [PATCH 3/4] Add some core tools for debugging processes

---
 services/git-bridge/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile
index f6c63abeb7..0c28bfe5fa 100644
--- a/services/git-bridge/Dockerfile
+++ b/services/git-bridge/Dockerfile
@@ -25,7 +25,7 @@ RUN make package \
 
 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

From 7a934b8ebadf6279cb3bfb709f95d3fd9245f5c3 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <s@sd.ai>
Date: Mon, 21 Jun 2021 11:12:39 +0100
Subject: [PATCH 4/4] Update mockito

---
 services/git-bridge/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
         <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 -->