mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
Merge pull request #18028 from overleaf/csh-issue-18027-git-bridge-image
Run git-bridge on an image which is supported going forward GitOrigin-RevId: be4d9ad5b8c11f206a9c5519fc016075c3114aff
This commit is contained in:
parent
a179751986
commit
9278788bee
2 changed files with 6 additions and 7 deletions
|
@ -1,6 +1,6 @@
|
|||
# Dockerfile for git-bridge
|
||||
|
||||
FROM maven:3-jdk-11 as base
|
||||
FROM maven:3-amazoncorretto-11-debian as base
|
||||
|
||||
RUN apt-get update && apt-get install -y make git sqlite3 \
|
||||
&& rm -rf /var/lib/apt/lists
|
||||
|
@ -23,19 +23,18 @@ RUN make package \
|
|||
-name 'writelatex-git-bridge*jar-with-dependencies.jar' \
|
||||
-exec mv {} /git-bridge.jar \;
|
||||
|
||||
FROM openjdk:11-jre
|
||||
FROM amazoncorretto:11-alpine
|
||||
|
||||
RUN apt-get update && apt-get install -y git sqlite3 procps htop net-tools sockstat libjemalloc2 \
|
||||
&& rm -rf /var/lib/apt/lists
|
||||
RUN apk add --update --no-cache git sqlite procps htop net-tools jemalloc
|
||||
|
||||
ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
|
||||
ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2
|
||||
|
||||
# Install Google Cloud Profiler agent
|
||||
RUN mkdir -p /opt/cprof && \
|
||||
wget -q -O- https://storage.googleapis.com/cloud-profiler/java/latest/profiler_java_agent.tar.gz \
|
||||
| tar xzv -C /opt/cprof
|
||||
|
||||
RUN useradd --create-home node
|
||||
RUN adduser -D node
|
||||
|
||||
COPY --from=builder /git-bridge.jar /
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
/opt/envsubst < /envsubst_template.json > /conf/runtime.json
|
||||
|
||||
|
|
Loading…
Reference in a new issue