github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 00:13:43 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #131 from overleaf/spd-revert-jemalloc

Browse source 
Revert "Merge pull request #129 from overleaf/spd-jeprof"
This commit is contained in:
Simon Detheridge 2021-07-07 12:09:02 +01:00 committed by GitHub
commit 12b8c0a1c0
2 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
services/git-bridge/Dockerfile
View file

@ -2,26 +2,8 @@
FROM maven:3-jdk-11 as base FROM maven:3-jdk-11 as base
RUN apt-get update && apt-get install -y make git sqlite3 build-essential dpkg-dev RUN apt-get update && apt-get install -y make git sqlite3 \
&& rm -rf /var/lib/apt/lists
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
COPY vendor/envsubst /opt/envsubst COPY vendor/envsubst /opt/envsubst
RUN chmod +x /opt/envsubst RUN chmod +x /opt/envsubst
@ -59,9 +41,6 @@ RUN mkdir /opt/cdbg && \
RUN useradd --create-home node RUN useradd --create-home node
COPY --from=builder /git-bridge.jar / COPY --from=builder /git-bridge.jar /
COPY --from=builder /build/*.deb /tmp/
RUN dpkg -i /tmp/libjemalloc*.deb
COPY vendor/envsubst /opt/envsubst COPY vendor/envsubst /opt/envsubst
RUN chmod +x /opt/envsubst RUN chmod +x /opt/envsubst

2
services/git-bridge/start.sh
View file

@ -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}" 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 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 exec java $GIT_BRIDGE_JVM_ARGS -jar /git-bridge.jar /conf/runtime.json