From e505ecc8c0d5a97667ea7d16d448f0673e8b16ea Mon Sep 17 00:00:00 2001
From: Simon Detheridge <s@sd.ai>
Date: Fri, 2 Jul 2021 17:04:41 +0100
Subject: [PATCH] Revert "Merge pull request #129 from overleaf/spd-jeprof"

This reverts commit 4268e58ff36bd591d40e3730446b691440c34409, reversing
changes made to 6c1eaae2eeb4949b7466c36d4a2e722697294c0b.
---
 services/git-bridge/Dockerfile | 25 ++-----------------------
 services/git-bridge/start.sh   |  2 --
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile
index 997a168934..5367380bde 100644
--- a/services/git-bridge/Dockerfile
+++ b/services/git-bridge/Dockerfile
@@ -2,26 +2,8 @@
 
 FROM maven:3-jdk-11 as base
 
-RUN apt-get update && apt-get install -y make git sqlite3 build-essential dpkg-dev
-
-RUN echo "deb-src http://deb.debian.org/debian buster main" >> /etc/apt/sources.list && \
-    echo "deb-src http://deb.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \
-    echo "deb-src http://security.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list
-
-RUN mkdir -p /build
-WORKDIR /build
-
-RUN apt-get update && \
-    apt-get -y source libjemalloc-dev && \
-    apt-get -y build-dep libjemalloc-dev && \
-    echo "override_dh_auto_configure:" >> jemalloc-5.1.0/debian/rules && \
-    echo "\tdh_auto_configure -- --enable-debug --enable-fill --enable-prof --enable-stat" >> jemalloc-5.1.0/debian/rules && \
-    cat jemalloc-5.1.0/debian/rules
-
-WORKDIR /build/jemalloc-5.1.0
-RUN dpkg-buildpackage
-
-RUN rm -rf /var/lib/apt/lists
+RUN apt-get update && apt-get install -y make git sqlite3 \
+ && rm -rf /var/lib/apt/lists
 
 COPY vendor/envsubst /opt/envsubst
 RUN chmod +x /opt/envsubst
@@ -59,9 +41,6 @@ RUN mkdir /opt/cdbg && \
 RUN useradd --create-home node
 
 COPY --from=builder /git-bridge.jar /
-COPY --from=builder /build/*.deb /tmp/
-
-RUN dpkg -i /tmp/libjemalloc*.deb
 
 COPY vendor/envsubst /opt/envsubst
 RUN chmod +x /opt/envsubst
diff --git a/services/git-bridge/start.sh b/services/git-bridge/start.sh
index fcd4642efe..1aa0a9314a 100755
--- a/services/git-bridge/start.sh
+++ b/services/git-bridge/start.sh
@@ -16,6 +16,4 @@ if [ "$ENABLE_DEBUG_AGENT" == "true" ]; then
   GIT_BRIDGE_JVM_ARGS="-agentpath:/opt/cdbg/cdbg_java_agent.so -Dcom.google.cdbg.module=git-bridge -Dcom.google.cdbg.version=$VERSION ${GIT_BRIDGE_JVM_ARGS}"
 fi
 
-export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so
-export MALLOC_CONF=prof:true,lg_prof_interval:30,lg_prof_sample:17,prof_prefix:/tmp/jemalloc
 exec java $GIT_BRIDGE_JVM_ARGS -jar /git-bridge.jar /conf/runtime.json